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

Timestamp:

Feb 10, 2012, 1:40:18 PM (14 years ago)

Author:

rhenders

Message:

got rid of dvoMeta table - now only use dvoImages table; whether we use DVO on-the-fly or already ingested data is passed as a boolean into the constructor

File:

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

trunk/ippToPsps/jython/batch.py

@@ -27 +27 @@
     '''
     Constructor
-
-    >>> batch = Batch(1,2,3,4,5,6,7)
-    >>> print batch.pspsVoTableFilePath
-    "../config/2/tables.vot"
     '''
     def __init__(self, 
@@ -41 +37 @@
                  batchID,
                  batchType, 
-                 fits): 
+                 fits,
+                 useFullTables): 
 
         self.everythingOK = False
@@ -48 +45 @@
         self.doc = doc
         self.fits = fits
+        self.useFullTables = useFullTables
 
         # set up logging
@@ -82 +80 @@
         self.dvoGpc1Label = self.doc.find("dvo/gpc1Label").text
         self.dvoLocation = self.doc.find("dvo/location").text
-        self.useFullTables = int(self.doc.find("dvo/useFullTables").text)
         self.scratchDb = ScratchDb(logger, self.doc, self.useFullTables)
 
@@ -496 +493 @@
     def getIDsFromDVO(self):
 
-        if self.scratchDb.getRowCount("dvoMeta") < 1:
-            self.logger.error("No DVO IDs found in dvoMeta")
+        if self.scratchDb.getRowCount(self.scratchDb.dvoImagesTable) < 1:
+            self.logger.errorInfo("No DVO images found in", self.scratchDb.dvoImagesTable)
             return False