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

Timestamp:

Feb 14, 2012, 12:02:48 PM (14 years ago)

Author:

rhenders

Message:

Big changes to support a new Config class that encapuslates the xml config file

File:

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

trunk/ippToPsps/jython/scratchdb.py

@@ -19 +19 @@
     Constructor
     '''
-    def __init__(self, logger, doc, useFull=0):
-        super(ScratchDb, self).__init__(logger, doc, "localdatabase")
+    def __init__(self, logger, config, useFull=0):
+        super(ScratchDb, self).__init__(logger, config, "localdatabase")
 
         if useFull:
@@ -484 +484 @@
 
     '''
-    Gets a list of PSPS image IDs for this stack ID
-    '''
-    def getDvoRegionsForThisBox(self, minRa, maxRa, minDec, maxDec):
+    Gets a list of DVO regions that overlap with the defined box
+    '''
+    def getDvoRegions(self, minRa, maxRa, minDec, maxDec):
 
         self.logger.debug("Querying DVO SkyTable for FITS files in this region")
+
+        regions = []
+        self.getDvoRegionsForThisBox(regions, minRa, maxRa, minDec, maxDec)
+
+        # deal with 0/360 boundary
+        if minRa < 0: self.getDvoRegionsForThisBox(regions, minRa + 360, 361 ,minDec, maxDec)
+        if maxRa > 360: self.getDvoRegionsForThisBox(regions, 0, maxRa - 360 ,minDec, maxDec)
+
+        return regions
+
+    '''
+    Gets a list of DVO regions that overlap with the defined box
+    '''
+    def getDvoRegionsForThisBox(self, regions, minRa, maxRa, minDec, maxDec):
 
         sql = "SELECT name FROM " + self.dvoSkyTable + " \
@@ -498 +512 @@
         try:
             rs = self.executeQuery(sql)
-        except:
-            self.logger.exception("Can't query for imageIDs")
-
-        files = []
-        while (rs.next()):
-            files.append(rs.getString(1))
-        rs.close()
-
-        return files
-
-
+            while (rs.next()): regions.append(rs.getString(1))
+            rs.close()
+        except:
+            self.logger.exception("Can't query for DVO regions")
+
+