Changeset 35369

Timestamp:

Apr 5, 2013, 6:16:49 AM (13 years ago)

Author:

eugene

Message:

fix test for imageID in dvo

Location:

branches/eam_branches/ipp-20130307/ippToPsps/jython

Files:

• detectionbatch.py (modified) (3 diffs)
• scratchdb.py (modified) (1 diff)

branches/eam_branches/ipp-20130307/ippToPsps/jython/detectionbatch.py

@@ -681 +681 @@
         # store these for later
         self.imageIDs[chipname] = header['IMAGEID']
+        self.sourceIDs[chipname] = header['SOURCEID']
             
         # populate ImageMeta
@@ -702 +703 @@
         # dictionary objects to hold imageIDs for later
         self.imageIDs = {}
+        self.sourceIDs = {}
 
         # loop through all OTAs and populate ImageMeta extensions
@@ -791 +793 @@
 
         # does this chip exist in the DVO image table (if NOT, then skip it)
-        if not self.scratchDb.haveThisChip(self.imageIDs[chipname]):
+        if not self.scratchDb.haveThisChip(self.imageIDs[chipname], self.sourceIDs[chipname]):
             self.logger.info("| %5s |            ------------- Chip not in DVO : rejecting ------------                    |" % chipname)
             return False

branches/eam_branches/ipp-20130307/ippToPsps/jython/scratchdb.py

@@ -370 +370 @@
     Checks whether the given chipID is in the DVO Image table
     '''
-    def haveThisChip(self, imageID):
-
-        sql = "SELECT IMAGE_ID FROM " + self.dvoImagesTable + " WHERE IMAGE_ID = " + str(imageID)
-
-        try:
-            rs = self.executeQuery(sql)
-            rs.first()
+    def haveThisChip(self, imageID, sourceID):
+
+        sql = "SELECT EXTERN_ID FROM " \
+            + self.dvoImagesTable + \
+            " WHERE EXTERN_ID = " + str(imageID) + \
+            " AND SOURCE_ID = " + str(sourceID)
+
+        try:
+            rs = self.executeQuery(sql)
+            
+            if not rs:
+                print "missing result set for imageID query"
+                raise
+
+            # if no returned rows, return an error
+            if not rs.next():
+                print "DVO lacks imageID ", imageID
+                print "sql: ", sql
+                return False
+
             if rs.getInt(1) == int(imageID):
                 # print "DVO has imageID ", imageID
                 return True
+
             else:
-                print "DVO lacks imageID ", imageID
+                print "DVO has wrong imageID? ", imageID
                 print "result was ", rs.getInt(1)
                 print "sql: ", sql
-                return False
+                raise
+
         except:
             print "DVO imageID query failed ", imageID
             print "sql: ", sql
-            return False
-
+            raise
+
+        # how can I reach this?
         return True