Changeset 32467

Timestamp:

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

Author:

rhenders

Message:

now does not create a new batchID itself, but has one passed-in to the constructor; now does not update the ipptopsps database when publishing to datastore as this is now done in the Datastore class itself.

File:

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

trunk/ippToPsps/jython/batch.py

@@ -39 +39 @@
                  ippToPspsDb,
                  id,
+                 batchID,
                  batchType, 
                  fits): 
@@ -60 +61 @@
         # set up class variables
         self.id = id
+        self.batchID = batchID
         self.gpc1Db = gpc1Db
         self.ippToPspsDb = ippToPspsDb
@@ -88 +90 @@
 
         # create datastore object
-        self.datastore = Datastore(self.logger, self.doc)
+        self.datastore = Datastore(self.logger, self.doc, self.ippToPspsDb)
 
         # create a new batch
-        self.batchID = self.ippToPspsDb.createNewBatch( 
-                self.batchType, 
-                self.id,
-                self.survey,
-                self.dvoGpc1Label, 
-                self.datastore.product)
+        #self.batchID = self.ippToPspsDb.createNewBatch( 
+        #       self.batchType, 
+        #        self.id,
+        #        self.survey,
+        #        self.dvoGpc1Label, 
+        #        self.datastore.product)
 
         # get local storage location from config
@@ -247 +249 @@
 
         outPath = self.localOutPath + "/BatchManifest.xml"
-        tmpPath = "./tmp.xml"
+        tmpPath = self.localOutPath + "/tmp.xml"
         self.logger.infoPair("Creating manifest", outPath)
         root = Element('manifest')
@@ -316 +318 @@
 
         # 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 +324 @@
     '''
     @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")
 
     '''