Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/datastore.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/datastore.py (modified) (5 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/datastore.py

@@ -5 +5 @@
 import logging
 import sys
+import re
 from xml.etree.ElementTree import ElementTree, Element, tostring
+
+from ipptopspsdb import IppToPspsDb
 
 '''
@@ -16 +19 @@
 
     '''
-    def __init__(self, logger, doc):
+    def __init__(self, logger, config, ippToPspsDb):
     
         # setup logger
         self.logger = logger
-        self.doc = doc
-        self.logger.debug("Datastore constructor")
-
-        # open config
-        self.product = doc.find("datastore/product").text
-        self.type = doc.find("datastore/type").text
-
-        self.logger.debug("Using product: '" + self.product + "' and type: '" + self.type + "'")
+        self.config = config
+        self.ippToPspsDb = ippToPspsDb
 
     '''
@@ -34 +31 @@
     def publish(self, name, path, file, fileType):
 
+        # TODO should handle this better
+        batchID = int(name[1:])
+
         self.logger.infoPair("Attempting to publish",  path + "/" + file)
         tempFile = tempfile.NamedTemporaryFile(mode='w+b')
@@ -39 +39 @@
         tempFile.seek(0)
 
-        # build dsreg command command
+        # build dsreg command
         command  = "dsreg --add " + name + "\
-                    --copy --datapath " + path + "\
-                    --type " + self.type + "\
-                    --product " + self.product + "\
+                    --link --datapath " + path + "\
+                    --type " + self.config.datastoreType + "\
+                    --product " + self.config.datastoreProduct + "\
                     --list " + tempFile.name
 
@@ -52 +52 @@
             self.logger.errorPair("Datastore publish",  "failed")
             ret = False
+            self.ippToPspsDb.updateLoadedToDatastore(batchID, -1)
         else:
             self.logger.infoPair("Datastore publish", "successful")
             ret = True
+            self.ippToPspsDb.updateLoadedToDatastore(batchID, 1)
             
+        tempFile.close()
 
-        tempFile.close()
         return ret
-
 
     '''
     Removes an item from the datastore
+
+    NB this will return a success if the batch is not found on the datastore
     '''
     def remove(self, name):
+
+        # TODO should handle this better
+        batchID = int(name[1:])
 
         command = "dsreg \
                    --del " + name + " \
                    --rm \
-                   --product " + self.product
+                   --product " + self.config.datastoreProduct
 
-        p = Popen(command, shell=True, stdout=PIPE)
+        p = Popen(command, shell=True, stdout=PIPE, stderr=PIPE)
         p.wait()
+        output, errors = p.communicate()
 
         if p.returncode != 0:
-            self.logger.errorPair("Datastore removal failed",  name)
-            ret = False
+            if re.search("not found in", errors):
+                self.logger.infoPair("Datastore batch not found", name)
+                ret = True
+                self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
+            else:
+                self.logger.infoPair("Datastore removal FAILED", name)
+                ret = False
         else:
+            self.logger.infoPair("Datastore removal successful", name)
             ret = True
-            self.logger.infoPair("Datastore removal successful", name)
+            self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
             
         return ret