Changeset 31965 for trunk/ippToPsps/jython/stackbatch.py

Timestamp:

Aug 1, 2011, 4:05:53 PM (15 years ago)

Author:

rhenders

Message:

finally cleared up image_id/extern_id confusion

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (3 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -88 +88 @@
        # insert sourceID/imageID combo so DVO can look it up
        if not self.useFullTables:
-           self.scratchDb.insertNewDvoImage(self.header['SOURCEID'], self.header['IMAGEID'])
+           self.scratchDb.insertNewDvoExternID(self.header['SOURCEID'], self.header['IMAGEID'])
 
     '''
@@ -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 \
@@ -595 +596 @@
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.sourceID = " + self.header['SOURCEID'] + "\
-               AND b.imageID = " + self.header['IMAGEID']
+               AND b.imageID = " + str(imageID)
         self.scratchDb.execute(sql)