Changeset 35369 for branches/eam_branches/ipp-20130307/ippToPsps/jython/scratchdb.py

Timestamp:

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

Author:

eugene

Message:

fix test for imageID in dvo

File:

• branches/eam_branches/ipp-20130307/ippToPsps/jython/scratchdb.py (modified) (1 diff)

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