Changeset 35185

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

Location:

trunk/ippToPsps/jython

Files:

• gpc1db.py (modified) (2 diffs)
• ipptopspsdb.py (modified) (1 diff)
• loader.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' \

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -1099 +1099 @@
             return 0
 
+        if value is None:
+            return 0
+
         print "box ingested host ", value, " does not match db host ", host
         raise

trunk/ippToPsps/jython/loader.py

@@ -118 +118 @@
 
         numAttempts = 0
+        abort = False
         while True:
 
@@ -138 +139 @@
                 self.logger.infoPair("client status", "ok")
 
-                abort = False
                 for batchType in self.skychunk.batchTypes: