Changeset 31965 for trunk/ippToPsps/jython/scratchdb.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/scratchdb.py (modified) (5 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -52 +52 @@
             return -1
 
+    ''' 
+    Gets imageID from extern ID 
+    ''' 
+    def getImageIDFromExternID(self, sourceID, externID): 
+               
+        imageID = -1 
+               
+        sql = "SELECT imageID FROM " + self.dvoMeta + " WHERE sourceID = %s AND externID = %s" % (sourceID, externID) 
+        try: 
+            rs = self.executeQuery(sql)   
+            rs.first() 
+            imageID = rs.getInt(1) 
+        except: 
+            self.logger.exception("Unable to get imageID from dvo meta table using " + sql) 
+              
+        return imageID 
+
     '''
     Gets DVO image flags
     '''
-    def getDvoImageFlags(self, sourceID, imageID):
+    def getDvoImageFlags(self, sourceID, externID):
 
         flags = 0
 
-        sql = "SELECT flags FROM " + self.dvoMeta + " WHERE sourceID = %s AND imageID = %s" % (sourceID, imageID)
+        sql = "SELECT flags FROM " + self.dvoMeta + " WHERE sourceID = %s AND externID = %s" % (sourceID, externID)
         try:
             rs = self.executeQuery(sql)  
@@ -71 +88 @@
     Gets photcode (aka photoCalID from dvo table)
     '''
-    def getPhotoCalID(self, sourceID, imageID):
+    def getPhotoCalID(self, sourceID, externID):
 
         photcode = -1
 
-        sql = "SELECT photcode FROM " + self.dvoMeta + " WHERE sourceID = %s AND imageID = %s" % (sourceID, imageID)
+        sql = "SELECT photcode FROM " + self.dvoMeta + " WHERE sourceID = %s AND externID = %s" % (sourceID, externID)
         try:
             rs = self.executeQuery(sql)  
@@ -96 +113 @@
     Inserts a new sourceID/imageID combo into dvoMeta
     '''
-    def insertNewDvoImage(self, sourceID, imageID):
+    def insertNewDvoExternID(self, sourceID, externID):
 
         sql = "INSERT INTO dvoMeta ( \
                sourceID, \
-               imageID \
+               externID \
                ) VALUES (\
                " + str(sourceID) + ", \
-               " + str(imageID) + "    \
+               " + str(externID) + "   \
                )"
         self.execute(sql)
@@ -152 +169 @@
                sourceID INT, \
                imageID INT, \
+               externID INT, \
                flags INT, \
                photcode INT, \
-               PRIMARY KEY (sourceID, imageID) \
+               PRIMARY KEY (sourceID, imageID, externID) \
                )"
 
@@ -172 +190 @@
                PRIMARY KEY (sourceID, imageID, ippDetectID) \
                )"
-               #INDEX (sourceID), \
-               #INDEX (imageID), \
-               #INDEX (ippDetectID) \
 
         try: self.execute(sql)