Changeset 14065 for trunk/ippTools/share

Timestamp:

Jul 6, 2007, 5:42:07 PM (19 years ago)

Author:

jhoblitt

Message:

remove chipInputImfile table

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• chiptool_completely_processed_exp.sql (modified) (2 diffs)
• chiptool_pendingimfile.sql (modified) (2 diffs)
• chiptool_queuerawimfile.sql (deleted)

trunk/ippTools/share/Makefile.am

@@ -9 +9 @@
         chiptool_pendingimfile.sql \
         chiptool_processedimfile.sql \
-        chiptool_queuerawimfile.sql \
         detselect_search.sql \
         detselect_select.sql \

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -2 +2 @@
 SELECT DISTINCT
     chip_id,
+    exp_id,
     state,
     workdir,
@@ -15 +16 @@
         chipProcessedImfile.class_id
     FROM chipRun
-    JOIN chipInputImfile
-        USING(chip_id)
-    JOIN rawExp
-        ON chipInputImfile.exp_id = rawExp.exp_id
     JOIN rawImfile
-        ON rawExp.exp_id = rawImfile.exp_id
+        USING(exp_id)
     LEFT JOIN chipProcessedImfile
-        ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
-        AND chipInputImfile.exp_id = chipProcessedImfile.exp_id
-        AND chipInputImfile.class_id = chipProcessedImfile.class_id
+        ON chipRun.chip_id = chipProcessedImfile.chip_id
+        AND rawImfile.exp_id = chipProcessedImfile.exp_id
+        AND rawImfile.class_id = chipProcessedImfile.class_id
     WHERE
         chipRun.state = 'run'
         AND chipProcessedImfile.fault = 0
     GROUP BY
-        chipInputImfile.chip_id,
-        chipInputImfile.exp_id
+        chipRun.chip_id,
+        chipRun.exp_id
     HAVING COUNT(rawImfile.class_id) = COUNT(chipProcessedImfile.class_id)
     ) as Foo

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -1 +1 @@
 SELECT
     chipRun.*,
-    chipInputImfile.exp_id,
-    chipInputImfile.class_id,
+    rawImfile.class_id,
     rawImfile.uri,
     rawExp.exp_tag,
@@ -10 +9 @@
     rawExp.filelevel
 FROM chipRun
-JOIN chipInputImfile
-    USING(chip_id)
+JOIN rawExp
+    USING(exp_id)
+JOIN rawImfile
+    USING(exp_id)
 LEFT JOIN chipProcessedImfile
-    ON chipInputImfile.chip_id = chipProcessedImfile.chip_id
-    AND chipInputImfile.exp_id = chipProcessedImfile.exp_id
-    AND chipInputImfile.class_id = chipProcessedImfile.class_id
-JOIN rawImfile
-    ON chipInputImfile.exp_id = rawImfile.exp_id
-    AND chipInputImfile.class_id = rawImfile.class_id
-JOIN rawExp
-    ON rawImfile.exp_id = rawExp.exp_id
+    ON chipRun.chip_id = chipProcessedImfile.chip_id
+    AND rawImfile.exp_id = chipProcessedImfile.exp_id
+    AND rawImfile.class_id = chipProcessedImfile.class_id
 LEFT JOIN chipMask
     ON chipRun.label = chipMask.label