Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/scratchdb.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/scratchdb.py (modified) (3 diffs)

branches/eam_branches/ipp-20120405/ippToPsps/jython/scratchdb.py

@@ -278 +278 @@
             rs.close()
         except:
-            self.logger.errorPai("Can't query for ingested regions", sql)
+            self.logger.errorPair("Can't query for ingested regions", sql)
 
         return regions
@@ -408 +408 @@
                     self.logger.errorPair("Unable to delete " + fileType + " file from", self.dvoDoneTable)
 
-               sql = "DROP TABLE " + self.getDbFriendlyTableName(region + "." + fileType)
-               self.execute(sql)
+               tableName = self.getDbFriendlyTableName(region + "." + fileType) 
+               sql = "DROP TABLE " + tableName
+               try: self.execute(sql)
+               except:
+                    self.logger.errorPair("Unable to drop table", tableName)
+                    pass
 
         deletedDetectionCount = detectionCount - self.getRowCount(self.dvoDetectionTable)
@@ -540 +544 @@
 
     '''
-    Gets the 'code' for the provided filter
-    '''
-    def getCodeForThisFilter(self, filter):
-
-        code = -1
-        sql = "SELECT CODE FROM " + self.dvoPhotcodesTable + " WHERE NAME = '" + filter + "'"
-        try:
-            rs = self.executeQuery(sql)
-            rs.first()
-            code = rs.getInt(1)
+    Gets a list of filters ordered as thy are in the DVO Photcodes table, as this reflects the order they apper in the cps file
+    '''
+    def getOrderedListOfFiltersFromPhotcodesTable(self, interestedFilters):
+
+        sql = "SELECT NAME FROM " + self.dvoPhotcodesTable + " WHERE "
+
+        count = 0
+        for filter in interestedFilters:
+           if count != 0: sql = sql + " OR "
+           sql = sql + " name = '" + filter + "'"
+           count += 1
+
+        sql = sql + " ORDER BY CODE"
+
+        orderedFilters = []
+        try:
+            rs = self.executeQuery(sql)
+            row = 1
+            while (rs.next()):
+                orderedFilters.append([row,rs.getString(1)])
+                row += 1
             rs.close()
         except:
-            self.logger.errorPair("Could not get filter code using", sql )
-
-        return code
-
+            self.logger.errorPair("Could not get ordered filter list", sql )
+
+        return orderedFilters
+