Changeset 12174 for trunk/ippTools/share

Timestamp:

Mar 1, 2007, 4:57:45 PM (19 years ago)

Author:

jhoblitt

Message:

first pass working chiptool -queuerawexp
normalize chipPending[Exp|Imfile] & chipProcessed[Exp|Imfile]

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• chiptool_completely_processed_exp.sql (modified) (1 diff)
• chiptool_find_unprocessed_imfile.pl (modified) (1 diff)
• chiptool_pendingimfile.sql (modified) (1 diff)
• chiptool_queuerawexp.sql (added)
• chiptool_queuerawimfile.sql (added)

trunk/ippTools/share/Makefile.am

@@ -9 +9 @@
         regtool_find_unprocessed_imfile.sql \
         regtool_processedimfile.sql \
-        regtool_pendingexp.sql
+        regtool_pendingexp.sql \
+        chiptool_queuerawexp.sql

trunk/ippTools/share/chiptool_completely_processed_exp.sql

@@ -12 +12 @@
     ON chipPendingExp.exp_tag = rawExp.exp_tag
 LEFT JOIN chipProcessedExp
-    ON chipPendingExp.exp_tag = chipProcessedExp.exp_tag
+    ON chipPendingExp.chip_id = chipProcessedExp.chip_id
 LEFT JOIN chipPendingImfile
-    ON chipPendingExp.exp_tag = chipPendingImfile.exp_tag
+    ON chipPendingExp.chip_id = chipPendingImfile.chip_id
 LEFT JOIN chipProcessedImfile
-    ON chipPendingExp.exp_tag = chipProcessedImfile.exp_tag
+    ON chipPendingExp.chip_id = chipProcessedImfile.chip_id
 WHERE
-    chipProcessedExp.exp_tag IS NULL
-    AND chipPendingImfile.exp_tag IS NULL
-    AND chipProcessedImfile.exp_tag IS NOT NULL
+    chipProcessedExp.chip_id IS NULL
+    AND chipPendingImfile.chip_id IS NULL
+    AND chipProcessedImfile.chip_id IS NOT NULL
 GROUP BY
-    chipPendingExp.exp_tag
+    chipPendingExp.chip_id
 HAVING rawExp.imfiles = COUNT(chipProcessedImfile.class_id)

trunk/ippTools/share/chiptool_find_unprocessed_imfile.pl

@@ -3 +3 @@
 FROM chipPendingImfile
 LEFT JOIN chipProcessedImfile
-    USING(exp_tag, class_id)
+    USING(chip_id, class_id)
 WHERE
-    chipProcessedImfile.exp_tag IS NULL
+    chipProcessedImfile.chip_id IS NULL
     AND chipProcessedImfile.class_id IS NULL

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -5 +5 @@
 FROM chipPendingImfile
 JOIN chipPendingExp
-    USING(exp_tag)
+    USING(chip_id)
 JOIN rawExp
-    USING(exp_tag)
+    ON chipPendingExp.exp_tag = rawExp.exp_tag
 LEFT JOIN chipMask
     ON chipPendingExp.label = chipMask.label