Changeset 35185 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Feb 20, 2013, 3:28:29 PM (13 years ago)

Author:

eugene

Message:

test for None from box.ingested; test for camProcessedExp.fault and addProcessedExp.fault; abort was in wrong location

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -61 +61 @@
             sql = "SELECT DISTINCT stage_id, DEGREES(ra), DEGREES(decl) \
                    FROM addRun \
+                   JOIN addProcessedExp USING (add_id) \
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
                    JOIN camRun ON (stage_id = cam_id) \
+                   JOIN camProcessedExp USING(cam_id) \
                    JOIN chipRun USING (chip_id) \
                    JOIN rawExp USING (exp_id) \
@@ -73 +75 @@
                    AND minidvodbProcessed.fault = 0 \
                    AND mergedvodbProcessed.fault = 0 \
+                   AND camProcessedExp.fault = 0 \
+                   AND addProcessedExp.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \