Changeset 32194 for trunk/ippToPsps

Timestamp:

Aug 25, 2011, 1:09:32 PM (15 years ago)

Author:

rhenders

Message:

added static method to publish a batch to the datastore, this is so batches that processed ok, but failed to reachdatastore, can be reloaded

File:

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

trunk/ippToPsps/jython/batch.py

@@ -285 +285 @@
     Publishes this batch to the datastore
     '''
-    def publishToDatastore(self):
+    def tarZipAndpublishToDatastore(self):
       
         # set up filenams and paths
@@ -308 +308 @@
 
         # now publish to the datastore
-        if self.datastore.publish(self.batchName, self.subDir, tarballFile, "tgz"):
-            self.ippToPspsDb.updateLoadedToDatastore(self.batchID, 1)
+        Batch.publishToDatastore(self.datastore, self.ippToPspsDb, self.batchID, self.batchName, self.subDir, tarballFile)
+
+    '''
+    Static method to publish a batch to the datastore
+    '''
+    @staticmethod
+    def publishToDatastore(datastore, ippToPspsDb, batchID, batchName, subDir, tarballFile):
+        if datastore.publish(batchName, subDir, tarballFile, "tgz"):
+            ippToPspsDb.updateLoadedToDatastore(batchID, 1)
+        else:
+            ippToPspsDb.updateLoadedToDatastore(batchID, -1)
+            
 
     '''
@@ -443 +453 @@
         except:
             self.logger.exception("Could not write to FITS")
+            self.ippToPspsDb.updateProcessed(self.batchID, -1)
             return False
 
@@ -510 +521 @@
             if self.exportPspsTablesToFits():
                 self.writeBatchManifest()
-                if int(self.doc.find("options/publishToDatastore").text): self.publishToDatastore()
+                if int(self.doc.find("options/publishToDatastore").text): self.tarZipAndpublishToDatastore()
                 if int(self.doc.find("options/reportNulls").text): self.reportNullsInAllPspsTables(False)