Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/datastore.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

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

branches/eam_branches/ipp-20110906/ippToPsps/jython/datastore.py

@@ -7 +7 @@
 import re
 from xml.etree.ElementTree import ElementTree, Element, tostring
+
+from ipptopspsdb import IppToPspsDb
 
 '''
@@ -17 +19 @@
 
     '''
-    def __init__(self, logger, doc):
+    def __init__(self, logger, doc, ippToPspsDb):
     
         # setup logger
         self.logger = logger
         self.doc = doc
+        self.ippToPspsDb = ippToPspsDb
         self.logger.debug("Datastore constructor")
 
@@ -35 +38 @@
     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')
@@ -40 +46 @@
         tempFile.seek(0)
 
-        # build dsreg command command
+        # build dsreg command
         command  = "dsreg --add " + name + "\
                     --copy --datapath " + path + "\
@@ -53 +59 @@
             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()
+
         return ret
 
@@ -66 +75 @@
     '''
     def remove(self, name):
+
+        # TODO should handle this better
+        batchID = int(name[1:])
 
         command = "dsreg \
@@ -80 +92 @@
                 self.logger.infoPair("Datastore batch not found", name)
                 ret = True
+                self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
             else:
                 self.logger.infoPair("Datastore removal FAILED", name)
@@ -86 +99 @@
             self.logger.infoPair("Datastore removal successful", name)
             ret = True
+            self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
             
         return ret