Changeset 31951

Timestamp:

Jul 29, 2011, 2:46:05 PM (15 years ago)

Author:

rhenders

Message:

externID column has been dropped from dvoMeta table

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (1 diff)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -533 +533 @@
     Updates provided table with DVO IDs from DVO table
     '''
-    def updateDvoIDs(self, table, sourceID, externID):
-
-        imageID = self.scratchDb.getImageIDFromExternID(sourceID, externID)
-        self.logger.debug("Updating table '" + table + "' with DVO IDs using imageID = %d" % imageID)
+    def updateDvoIDs(self, table, sourceID, imageID):
+
+        self.logger.debug("Updating table '" + table + "' with DVO IDs using imageID = " + imageID)
         sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetection + " AS b SET \
                a.ippObjID = b.ippObjID, \

trunk/ippToPsps/jython/stackbatch.py

@@ -588 +588 @@
     def updateDvoIDs(self, table):
 
-        imageID = self.scratchDb.getImageIDFromExternID(self.header['SOURCEID'], self.header['IMAGEID'])
-
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
         sql = "UPDATE IGNORE " + table + " AS a, " + self.scratchDb.dvoDetection + " AS b SET \
@@ -597 +595 @@
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.sourceID = " + self.header['SOURCEID'] + "\
-               AND b.imageID = " + str(imageID)
+               AND b.imageID = " + self.header['IMAGEID']
         self.scratchDb.execute(sql)