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

Timestamp:

Nov 2, 2015, 2:42:04 PM (11 years ago)

Author:

eugene

Message:

clean up some test vebosity

File:

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

trunk/ippToPsps/jython/scratchdb.py

@@ -190 +190 @@
 
         sql = "SELECT FLAGS FROM " + self.dvoImagesTable + " WHERE EXTERN_ID = %s" % (externID)
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("Unable to get flags from dvo using", sql)
+        else:
             flags = rs.getInt(1)
-        except:
-            self.logger.errorPair("Unable to get flags from dvo using", sql)
+
         return flags
 
@@ -206 +207 @@
 
         sql = "SELECT PHOTCODE FROM " + self.dvoImagesTable + " WHERE EXTERN_ID = %s" % (externID)
-        try:
-            rs = self.executeQuery(sql)  
-            rs.first()
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("Unable to get photcode from dvo with", sql)
+        else:
             photcode = rs.getInt(1)
-        except:
-            self.logger.errorPair("Unable to get photcode from dvo with", sql)
-
+
+        return photcode
+
+    '''
+    Gets photcode (aka photoCalID from dvo table)
+    '''
+    def getPhotcodeByName(self, photcodeName):
+
+        photcode = -1
+
+        sql = "SELECT CODE FROM %s WHERE NAME = '%s'" % (self.dvoPhotcodesTable, photcodeName)
+        rs = self.executeQuery(sql)  
+
+        if not rs.first():
+            self.logger.errorPair("No photcode found for ", photcodeName)
+            print "--- sql: " + sql
+            os._exit(2)
+
+        photcode = rs.getInt(1)
         return photcode