Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/batch.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/batch.py (modified) (7 diffs)

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

@@ -39 +39 @@
                  ippToPspsDb,
                  id,
+                 batchID,
                  batchType, 
                  fits): 
@@ -53 +54 @@
         self.logger.debug("Batch class constructor")
 
-        # check FITS file is ok - TODO could be neater
-        if self.fits: 
-            self.header = self.fits.getPrimaryHeader()
-            if not self.header: return
-
         # set up class variables
         self.id = id
+        self.batchID = batchID
         self.gpc1Db = gpc1Db
         self.ippToPspsDb = ippToPspsDb
         self.batchType = batchType;
         self.pspsVoTableFilePath = "../config/" + batchType + "/tables.vot"
+
+        # check FITS file is ok
+        if self.fits: 
+            self.header = self.fits.getPrimaryHeader()
+
+            # now check that the fits header is readable
+            if not self.header: 
+                logger.errorPair("Could not read FITS for id", "%d" % id)
+                return
+
+        # if no fits file, and this is not an IN batch, then get out of here
+        else:
+           if batchType != "IN": 
+               logger.errorPair("Could not read FITS for id", "%d" % id)
+               return
 
         # get info from config
@@ -88 +100 @@
 
         # create datastore object
-        self.datastore = Datastore(self.logger, self.doc)
-
-        # create a new batch
-        self.batchID = self.ippToPspsDb.createNewBatch( 
-                self.batchType, 
-                self.id,
-                self.survey,
-                self.dvoGpc1Label, 
-                self.datastore.product)
+        self.datastore = Datastore(self.logger, self.doc, self.ippToPspsDb)
 
         # get local storage location from config
@@ -247 +251 @@
 
         outPath = self.localOutPath + "/BatchManifest.xml"
-        tmpPath = "./tmp.xml"
+        tmpPath = self.localOutPath + "/tmp.xml"
         self.logger.infoPair("Creating manifest", outPath)
         root = Element('manifest')
@@ -263 +267 @@
         else: root.attrib['maxObjId'] = str(self.maxObjID)
 
-        # get md5sum
-        #p = Popen("md5sum " + self.outputFitsPath, shell=True, stdout=PIPE)
-        #p.wait()
-        #out = p.stdout.read()
-        #md5sum = out[0:out.rfind(" ")]
-
-        # get file size
-        #fileSize = os.path.getsize(self.outputFitsPath)
-
         # file information
         child = Element('file')
         root.append(child)
         child.attrib['name'] = self.outputFitsFile
-        #child.attrib['bytes'] = str(fileSize)
-        #child.attrib['md5'] = md5sum
 
         # now create doc and write to file
@@ -316 +309 @@
 
         # now publish to the datastore
-        Batch.publishToDatastore(self.datastore, self.ippToPspsDb, self.batchID, self.batchName, self.subDir, tarballFile)
+        Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
 
     '''
@@ -322 +315 @@
     '''
     @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)
-            
+    def publishToDatastore(datastore, batchID, batchName, subDir, tarballFile):
+        datastore.publish(batchName, subDir, tarballFile, "tgz")
 
     '''