Index: /trunk/ippToPsps/jython/scratchdb.py
===================================================================
--- /trunk/ippToPsps/jython/scratchdb.py	(revision 31398)
+++ /trunk/ippToPsps/jython/scratchdb.py	(revision 31399)
@@ -19,7 +19,15 @@
     Constructor
     '''
-    def __init__(self, logger):
+    def __init__(self, logger, useFull=False):
         super(ScratchDb, self).__init__(logger,"localdatabase")
-        self.logger.debug("ScratchDb constructor")
+
+        if useFull:
+            self.dvoMeta = "dvoMetaNew"
+            self.dvoDetection = "dvoDetectionFull"
+        else:
+            self.dvoMeta = "dvoMeta"
+            self.dvoDetection = "dvoDetection"
+
+        self.logger.debug("ScratchDb constructor, using DVO tables: " + self.dvoMeta + " and " + self.dvoDetection)
 
     '''
@@ -47,9 +55,9 @@
     Gets DVO image flags
     '''
-    def getDvoImageFlags(self, sourceID, imageID):
+    def getDvoImageFlags(self, sourceID, externID):
 
         flags = 0
 
-        sql = "SELECT flags FROM 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.stmt.executeQuery(sql)  
@@ -62,11 +70,28 @@
 
     '''
+    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.stmt.executeQuery(sql)  
+            rs.first()
+            imageID = rs.getInt(1)
+        except:
+            self.logger.exception("Unable to get imageID from dvo meta table")
+
+        return imageID
+
+    '''
     Gets photcode (aka photoCalID from dvo table)
     '''
-    def getPhotoCalID(self, sourceID, imageID):
+    def getPhotoCalID(self, sourceID, externID):
 
         photcode = -1
 
-        sql = "SELECT photcode FROM 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.stmt.executeQuery(sql)  
@@ -74,5 +99,5 @@
             photcode = rs.getInt(1)
         except:
-            self.logger.exception("Unable to get photcode from dvo table")
+            self.logger.exception("Unable to get photcode from dvo table with: " + sql)
 
         return photcode