Changeset 31720 for trunk/ippToPsps/jython/batch.py

Timestamp:

Jun 27, 2011, 4:25:39 PM (15 years ago)

Author:

rhenders

Message:

now using config file values to determine whether we publish to datastore, report NULLS etc; fixed bug in findAndReadFITSHeader() where subsequent hdr extesnions were not being read after one fails

File:

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

trunk/ippToPsps/jython/batch.py

@@ -73 +73 @@
 
         # open config
-        doc = ElementTree(file="config.xml")
+        self.doc = ElementTree(file="config.xml")
 
         if self.survey != "":
@@ -79 +79 @@
    
             # get dvo info from config
-            dvoName = doc.find("dvo_" + self.survey + "/name").text
-            self.dvoLocation = doc.find("dvo_" + self.survey + "/location").text
+            dvoName = self.doc.find("dvo_" + self.survey + "/name").text
+            self.dvoLocation = self.doc.find("dvo_" + self.survey + "/location").text
         else:
             dvoName = ""
             self.dvoLocation = ""
             self.surveyID = -1;
-         
+       
+        # get some options from the config
+        self.dataRelease = self.doc.find("metadata/dataRelease").text
+
         # get datastore info from config
         self.datastore = Datastore(self.logger)
@@ -98 +101 @@
         # get local storage location from config
         self.batchName = "B%08d" % self.batchID
-        self.subDir = doc.find("localOutPath").text + "/" + self.getPspsBatchType() + "/" + dvoName
+        self.subDir = self.doc.find("localOutPath").text + "/" + self.getPspsBatchType() + "/" + dvoName
         self.localOutPath = self.subDir + "/" + self.batchName 
         if not os.path.exists(self.localOutPath): os.makedirs(self.localOutPath)
@@ -156 +159 @@
 
         found = False
-        
+       
+        origIndex = file.tell()
         while True:
            
@@ -175 +179 @@
             file.seek(index + 2880, 0)
             
-        if found != True: 
+        if found != True:
+
+            file.seek(origIndex, 0)
             self.logger.error("...could not read header in extension '" + name + "'")
             return
@@ -238 +244 @@
     def createTarball(self):
       
+        if self.doc.find("options/createTarball").text == "false": return
+
         # set up filenams and paths
         tarFile = self.batchName + ".tar"
@@ -263 +271 @@
     '''
     def publishToDatastore(self):
+
+        if self.doc.find("options/publishToDatastore").text == "false": return
 
         if self.datastore.publish(self.batchName, self.subDir, self.tarballFile, "tgz"):
@@ -462 +472 @@
     def reportNullsInAllPspsTables(self, showPartials):
 
+        if self.doc.find("options/reportNulls").text == "false": return
+
         for table in self.pspsTables:
             self.scratchDb.reportNulls(table.name, showPartials)
@@ -515 +527 @@
 
         self.createEmptyPspsTables()
-        self.importIppTables()
+        #self.importIppTables()
         if self.populatePspsTables():
             if self.exportPspsTablesToFits():
@@ -521 +533 @@
                 self.createTarball()
                 self.publishToDatastore()
-                #self.reportNullsInAllPspsTables(False)
+                self.reportNullsInAllPspsTables(False)
                 #sys.exit()
         self.logger.info("Finished.")