Changeset 31356

Timestamp:

Apr 22, 2011, 4:20:18 PM (15 years ago)

Author:

rhenders

Message:

now checking if this stack has already been processed before proceeding

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (5 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -25 +25 @@
 
        self.logger.info("StackBatch constructor. Creating batch from: '" + inputFile + "'")
+
+       self.skyID = skyID
 
        # delete PSPS tables
@@ -36 +38 @@
 
        # delete IPP tables
-       self.scratchDb.dropTable("SkyChip_psf")
-       self.scratchDb.dropTable("SkyChip_xsrc")
-       self.scratchDb.dropTable("SkyChip_xfit")
-       self.scratchDb.dropTable("SkyChip_xrad")
+       #self.scratchDb.dropTable("SkyChip_psf")
+       #self.scratchDb.dropTable("SkyChip_xsrc")
+       #self.scratchDb.dropTable("SkyChip_xfit")
+       #self.scratchDb.dropTable("SkyChip_xrad")
 
        # obs time makes no sense except for nightly stacks
@@ -62 +64 @@
 
        # insert what we know about this stack batch into the stack table
-       self.ippToPspsDb.insertStackMeta(self.batchID, skyID, self.header['STK_ID'], self.filter, self.header['STK_TYPE'])
+       self.ippToPspsDb.insertStackMeta(self.batchID, self.skyID, self.header['STK_ID'], self.filter, self.header['STK_TYPE'])
 
        # insert sourceID/imageID combo so DVO can look it up
@@ -541 +543 @@
         return True
 
+    '''
+    Checks whether this batch has already been processed and published
+    '''
+    def alreadyProcessed(self):
+
+        return self.ippToPspsDb.alreadyProcessed("stack", "sky_id", self.skyID)
+
+
+
 logging.config.fileConfig("logging.conf")
 logger = logging.getLogger("stackbatch")
@@ -560 +571 @@
         logger.info("-------------- New Batch ----------")
         stackBatch = StackBatch(logger, skyID, file)
-    
-        stackBatch.createEmptyPspsTables()
-        stackBatch.importIppTables("")
-        if stackBatch.populatePspsTables():
+
+        if  stackBatch.alreadyProcessed():
+
+            stackBatch.createEmptyPspsTables()
+            stackBatch.importIppTables("")
+            if stackBatch.populatePspsTables():
  
-            stackBatch.reportNullsInAllPspsTables(False)
-            stackBatch.exportPspsTablesToFits()
-            stackBatch.writeBatchManifest()
-            stackBatch.createTarball()
-            stackBatch.publishToDatastore()
+                stackBatch.reportNullsInAllPspsTables(False)
+                stackBatch.exportPspsTablesToFits()
+                stackBatch.writeBatchManifest()
+                #stackBatch.createTarball()
+                #stackBatch.publishToDatastore()
 
         i = i + 1