Changeset 31231

Timestamp:

Apr 7, 2011, 10:06:53 AM (15 years ago)

Author:

rhenders

Message:

Fixed publish method so that it knows of success/failure; added removal method

File:

• trunk/ippToPsps/jython/datastore.py (modified) (4 diffs)

trunk/ippToPsps/jython/datastore.py

@@ -4 +4 @@
 import tempfile
 import logging
+import sys
 from xml.etree.ElementTree import ElementTree, Element, tostring
 
@@ -27 +28 @@
         self.type = doc.find("datastore/type").text
 
-        self.logger.debug("Publishing to '" + self.product + "' product")
-
+        self.logger.debug("Using product: '" + self.product + "' and type: '" + self.type + "'")
 
     '''
@@ -35 +35 @@
     def publish(self, name, path, file, fileType):
 
+        self.logger.info("Attempting to publish '" + path +"/" + file + "' to datastore product: '" + self.product + "', type: '" + self.type + "'")
         tempFile = tempfile.NamedTemporaryFile(mode='w+b')
         tempFile.write(file + "|||" + fileType)
@@ -48 +49 @@
         p = Popen(command, shell=True, stdout=PIPE)
         p.wait()
-       
-        #TODO check success print "Return from dsreg: " + p.stdout.read()
+
+        if p.returncode != 0:
+            self.logger.error("Datastore publish failed")
+            ret = False
+        else:
+            self.logger.info("Datastore publish successful")
+            ret = True
+            
 
         tempFile.close()
+        return ret
+
+
+    '''
+    Removes an item to the datastore
+    '''
+    def remove(self, name):
+
+        command = "dsreg \
+                   --del " + name + " \
+                   --rm \
+                   --product " + self.product
+
+        p = Popen(command, shell=True, stdout=PIPE)
+        p.wait()
+
+        if p.returncode != 0:
+            self.logger.error("Datastore removal of " + name + " failed")
+            ret = False
+        else:
+            ret = True
+            self.logger.info("Datastore removal of " + name + " successful")
+            
+        return ret
+