Index: trunk/ippToPsps/jython/scratchdb.py
===================================================================
--- trunk/ippToPsps/jython/scratchdb.py	(revision 33767)
+++ trunk/ippToPsps/jython/scratchdb.py	(revision 33768)
@@ -540,18 +540,30 @@
 
     '''
-    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"
+        print sql
+
+        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
+