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

Timestamp:

Jan 2, 2013, 3:50:39 PM (13 years ago)

Author:

heather

Message:

changes to init batch for flags table and also to skycal batches (was using wrong query)

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -61 +61 @@
                    JOIN rawExp USING (exp_id) \
                    JOIN mergedvodbRun using (minidvodb_id) \
+                   JOIN mergedvodbProcessed using (merge_id) \
                    WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND mergedvodbRun.state = 'full' \
                    AND minidvodbProcessed.fault = 0 \
+                   AND mergedvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
@@ -77 +79 @@
                    JOIN minidvodbRun USING(minidvodb_name) \
                    JOIN minidvodbProcessed USING(minidvodb_id) \
+                   JOIN mergedvodbRun USING(minidvodb_id) \
+                   JOIN mergedvodbProcessed USING (merge_id) \
                    JOIN  stackRun USING(stack_id) JOIN skycell USING(skycell_id) \
-                   WHERE minidvodbRun.minidvodb_group = '" + dvoDb + "' \
+                   WHERE mergedvodbRun.mergedvodb = '" + dvoDb + "' \
                    AND minidvodbRun.state = 'merged' \
                    AND minidvodbProcessed.fault = 0 \
+                   AND mergedvodbRun.state = 'full' \
+                   AND mergedvodbProcessed.fault = 0 \
                    AND addRun.stage = '" + stage + "' \
                    AND addRun.state = 'full' \
                    AND decdeg BETWEEN " + str(minDec) + " AND " + str(maxDec) + " \
                    AND radeg BETWEEN " + str(minRA) + " AND " + str(maxRA) 
-
+            
         try:
             rs = self.executeQuery(sql)