Changeset 31860

Timestamp:

Jul 11, 2011, 3:43:02 PM (15 years ago)

Author:

rhenders

Message:

yet another query to get all merged items in a DVO database

File:

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

trunk/ippToPsps/jython/gpc1db.py

@@ -69 +69 @@
             sql = "SELECT DISTINCT stage_id \
                    FROM addRun \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "' \
-                   AND state = 'full'"
+                   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":       
@@ -79 +83 @@
                    FROM staticskyInput \
                    JOIN addRun ON(staticskyInput.sky_id = addRun.stage_id) \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "' \
-                   AND state = 'full'"
-
+                   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)