Changeset 32337 for branches/eam_branches/ipp-20110710/ippToPsps/jython/gpc1db.py

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/ippToPsps/jython

Files:

• . (modified) (1 prop)
• gpc1db.py (modified) (8 diffs)

branches/eam_branches/ipp-20110710/ippToPsps/jython/gpc1db.py

@@ -69 +69 @@
             sql = "SELECT DISTINCT stage_id \
                    FROM addRun \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "'"
+                   JOIN minidvodbRun USING(minidvodb_name) \
+                   JOIN minidvodbProcessed USING(minidvodb_id) \
+                   WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
+                   AND minidvodbRun.state = 'merged' \
+                   AND minidvodbProcessed.fault = 0 \
+                   AND addRun.stage = '" + stage + "' \
+                   AND addRun.state = 'full'"
 
         elif batchType == "ST":       
@@ -78 +83 @@
                    FROM staticskyInput \
                    JOIN addRun ON(staticskyInput.sky_id = addRun.stage_id) \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "'"
-
+                   JOIN minidvodbRun USING(minidvodb_name) \
+                   JOIN minidvodbProcessed USING(minidvodb_id) \
+                   WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
+                   AND minidvodbRun.state = 'merged' \
+                   AND minidvodbProcessed.fault = 0 \
+                   AND addRun.stage = '" + stage + "' \
+                   AND addRun.state = 'full'"
+            
         try:
             rs = self.executeQuery(sql)
@@ -144 +154 @@
             rs = self.executeQuery(sql)
             rs.first()
+        except:
+            self.logger.errorPair("Can't query for", "stack meta data")
+           
+        try:
             meta.append(rs.getString(1))
             meta.append(rs.getString(2))
             meta.append(rs.getString(3))
         except:
-            self.logger.exception("Can't query for stack meta")
-
+            self.logger.errorPair("getStackStageMeta()", "empty meta data")
+     
         return meta
 
@@ -168 +182 @@
             rs = self.executeQuery(sql)
             rs.first()
+        except:
+            self.logger.errorPair("Can't query for", "camera meta data")
+
+        try:
             meta.append(rs.getInt(1))
             meta.append(rs.getString(2))
@@ -175 +193 @@
             meta.append(rs.getString(6))
         except:
-            self.logger.exception("Can't query for camera meta")
+            self.logger.errorPair("getCameraStageMeta()", "empty meta data")
 
         return meta
@@ -195 +213 @@
             rs.first()
         except:
-            self.logger.exception("Can't query for camera smfs")
-
+            self.logger.errorPair("Can't query for smf file for cam_id",  str(camID))
+            return None
+
+        try:
         # get path to base dir of cmf files
-        path = rs.getString(1)
-        path = path[0:path.rfind("/")]
+            path = rs.getString(1)
+            path = path[0:path.rfind("/")]
+        except:
+            self.logger.errorPair("No smf files found for cam_id", str(camID) )
+            return None
        
-        # list all cmf files if a neb path
+        # list all smf files if a neb path
         files = []
         if path.startswith("neb"):
@@ -211 +234 @@
         # or not a neb path
         else:
-            files = glob.glob(path + "/*.cmf")
-
-        if len(files) < 1: return "NULL"
+            files = glob.glob(path + "/*.smf")
+
+        if len(files) < 1: return None
 
         return Fits(self.logger, self.doc, files[0]) # TODO just returning first file - check
@@ -251 +274 @@
 
         self.logger.error("Could not find stack cmf")
-        return "NULL"
+        return None
 
     '''