Changeset 32466

Timestamp:

Sep 29, 2011, 3:29:40 PM (15 years ago)

Author:

rhenders

Message:

now accepting an IppToPspsDb object as a constructor argument and using it to update the database on success or failure of publishing or removal of batches from the datastore

File:

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

trunk/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")
 
@@ -34 +37 @@
     '''
     def publish(self, name, path, file, fileType):
+
+        # TODO should handle this better
+        batchID = int(name[1:])
 
         self.logger.infoPair("Attempting to publish",  path + "/" + file)
@@ -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()
@@ -66 +74 @@
     '''
     def remove(self, name):
+
+        # TODO should handle this better
+        batchID = int(name[1:])
 
         command = "dsreg \
@@ -80 +91 @@
                 self.logger.infoPair("Datastore batch not found", name)
                 ret = True
+                self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
             else:
                 self.logger.infoPair("Datastore removal FAILED", name)
@@ -86 +98 @@
             self.logger.infoPair("Datastore removal successful", name)
             ret = True
+            self.ippToPspsDb.updateDeletedDatastore(batchID, 1)
             
         return ret