Changeset 31950 for trunk/ippToPsps/jython/scratchdb.py

Timestamp:

Jul 29, 2011, 2:45:27 PM (15 years ago)

Author:

rhenders

Message:

Dropped externID from dvoMeta table. This is confusing since IMAGEID in the smf files does NOT equate to IMAGE_ID in DVO, but rather EXTERN_ID. sticking with smf name for ippToPsps

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (5 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -23 +23 @@
 
         if useFull:
-            self.dvoMeta = "dvoMetaNew"
+            self.dvoMeta = "dvoMetaFull"
             self.dvoDetection = "dvoDetectionFull"
         else:
@@ -55 +55 @@
     Gets DVO image flags
     '''
-    def getDvoImageFlags(self, sourceID, externID):
+    def getDvoImageFlags(self, sourceID, imageID):
 
         flags = 0
 
-        sql = "SELECT flags FROM " + self.dvoMeta + " WHERE sourceID = %s AND externID = %s" % (sourceID, externID)
+        sql = "SELECT flags FROM " + self.dvoMeta + " WHERE sourceID = %s AND imageID = %s" % (sourceID, imageID)
         try:
             rs = self.executeQuery(sql)  
@@ -69 +69 @@
 
     '''
-    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 photcode (aka photoCalID from dvo table)
     '''
-    def getPhotoCalID(self, sourceID, externID):
+    def getPhotoCalID(self, sourceID, imageID):
 
         photcode = -1
 
-        sql = "SELECT photcode FROM " + self.dvoMeta + " WHERE sourceID = %s AND externID = %s" % (sourceID, externID)
+        sql = "SELECT photcode FROM " + self.dvoMeta + " WHERE sourceID = %s AND imageID = %s" % (sourceID, imageID)
         try:
             rs = self.executeQuery(sql)  
@@ -117 +100 @@
         sql = "INSERT INTO dvoMeta ( \
                sourceID, \
-               imageID, \
-               externID \
+               imageID \
                ) VALUES (\
                " + str(sourceID) + ", \
-               " + str(imageID) + " ,   \
                " + str(imageID) + "    \
                )"
@@ -171 +152 @@
                sourceID INT, \
                imageID INT, \
-               externID INT, \
                flags INT, \
                photcode INT, \