Changeset 16588 for trunk/ippTools/share

Timestamp:

Feb 21, 2008, 6:09:46 PM (18 years ago)

Author:

jhoblitt

Message:

replumb pz* steps

Location:

trunk/ippTools/share

Files:

• pztool_find_completed_exp.sql (modified) (1 diff)
• pztool_pendingimfile.sql (modified) (1 diff)
• pztool_revertcopied.sql (modified) (1 diff)

trunk/ippTools/share/pztool_find_completed_exp.sql

@@ -1 +1 @@
 SELECT DISTINCT
-    exp_name, -- return should match pzDoneExp
+    exp_name, -- return should match pzDownloadExp
     camera,
-    telescope
+    telescope,
+    state
 FROM (
     SELECT
-        pzDoneImfile.*,
+        pzDownloadImfile.*,
+        pzDownloadExp.state,
         summitExp.imfiles
-    FROM pzDoneExp
+    FROM pzDownloadExp
     JOIN summitExp
         USING(exp_name, camera, telescope)
-    LEFT JOIN pzDoneImfile
+    LEFT JOIN pzDownloadImfile
         USING(exp_name, camera, telescope)
     LEFT JOIN newExp
-        ON pzDoneExp.exp_name = newExp.tmp_exp_name
-        AND pzDoneExp.camera = newExp.tmp_camera
-        AND pzDoneExp.telescope = newExp.tmp_telescope
+        ON pzDownloadExp.exp_name = newExp.tmp_exp_name
+        AND pzDownloadExp.camera = newExp.tmp_camera
+        AND pzDownloadExp.telescope = newExp.tmp_telescope
     WHERE
-        newExp.tmp_exp_name IS NULL
+        pzDownloadExp.state = 'run'
+        AND newExp.tmp_exp_name IS NULL
         AND newExp.tmp_camera IS NULL
         AND newExp.tmp_telescope IS NULL
     GROUP BY
-        pzDoneExp.exp_name,
-        pzDoneExp.camera,
-        pzDoneExp.telescope
-    -- it doesn't matter which field in pzDoneImfile we count as we've already
-    -- done a group by
+        pzDownloadExp.exp_name,
+        pzDownloadExp.camera,
+        pzDownloadExp.telescope
+    -- it doesn't matter which field in pzDownloadImfile we count as we've
+    -- already Download a group by
     HAVING
-        COUNT(pzDoneImfile.exp_name) = summitExp.imfiles
-        AND SUM(pzDoneImfile.fault) = 0
+        COUNT(pzDownloadImfile.exp_name) = summitExp.imfiles
+        AND SUM(pzDownloadImfile.fault) = 0
     ) as Foo

trunk/ippTools/share/pztool_pendingimfile.sql

@@ -4 +4 @@
         summitImfile.*,
         summitExp.dateobs
-    FROM pzPendingImfile
-    JOIN summitImfile
+    FROM summitImfile
+    JOIN pzDownloadExp
+        USING(exp_name, camera, telescope)
+    JOIN pzDownloadImfile
         USING(exp_name, camera, telescope, class, class_id)
     JOIN summitExp
         USING(exp_name, camera, telescope)
+    WHERE 
+        pzDownloadExp.state = 'run'
     ORDER BY
         summitExp.dateobs

trunk/ippTools/share/pztool_revertcopied.sql

@@ -1 @@
-DELETE FROM pzDoneImfile
+DELETE FROM pzDownloadImfile
 WHERE
     fault != 0