Changeset 14027

Timestamp:

Jul 5, 2007, 3:35:32 PM (19 years ago)

Author:

jhoblitt

Message:

remove regtool_find_unprocessed_imfile.sql

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• camtool_find_pendingexp.sql (modified) (1 diff)
• camtool_find_pendingimfile.sql (modified) (2 diffs)
• camtool_find_processedexp.sql (modified) (1 diff)

trunk/ippTools/share/Makefile.am

@@ -16 +16 @@
         difftool_skyfile.sql \
         difftool_todiffskyfile.sql \
-        regtool_find_unprocessed_imfile.sql \
         regtool_pendingexp.sql \
         regtool_pendingimfile.sql \

trunk/ippTools/share/camtool_find_pendingexp.sql

@@ -4 +4 @@
 SELECT
     camRun.*,
+    rawExp.exp_tag,
     rawExp.exp_id,
     rawExp.exp_name,

trunk/ippTools/share/camtool_find_pendingimfile.sql

@@ -1 @@
-SELECT * FROM 
+SELECT DISTINCT * FROM 
      -- the subselect is so where criteria can be specified without knowing
      -- which table the field came from
     (SELECT
-        camPendingExp.*,
-        chipProcessedExp.exp_id,
-        chipProcessedExp.guide_id,
+        camRun.*,
+        chipProcessedImfile.exp_id,
         chipProcessedImfile.class_id,
         chipProcessedImfile.uri,
@@ -16 +15 @@
         rawExp.telescope,
         rawExp.filelevel
-    FROM camPendingExp
-    JOIN chipProcessedExp
+    FROM camRun
+    JOIN chipRun
         USING(chip_id)
     JOIN chipProcessedImfile
         USING(chip_id)
     JOIN rawExp
-        ON chipProcessedExp.exp_id = rawExp.exp_id
+        ON chipProcessedImfile.exp_id = rawExp.exp_id
     LEFT JOIN camProcessedExp
-        ON camPendingExp.cam_id = camProcessedExp.cam_id
+        ON camRun.cam_id = camProcessedExp.cam_id
     LEFT JOIN camMask
-        ON camPendingExp.label = camMask.label
+        ON camRun.label = camMask.label
     WHERE
         camProcessedExp.cam_id IS NULL

trunk/ippTools/share/camtool_find_processedexp.sql

@@ -1 +1 @@
 SELECT
     camProcessedExp.*,
+    rawExp.exp_tag,
     rawExp.exp_name,
     rawExp.camera,