Changeset 11075 for trunk/ippTools/src/chiptool.c

Timestamp:

Jan 12, 2007, 12:24:34 PM (19 years ago)

Author:

jhoblitt

Message:

catch renaming raw*Exp -> rawExp conversions
update p3tool to the 'new' fault handling semantics

File:

• trunk/ippTools/src/chiptool.c (modified) (5 diffs)

trunk/ippTools/src/chiptool.c

@@ -99 +99 @@
             "SELECT"
             "   p2PendingImfile.*,"
-            "   rawScienceExp.camera"
+            "   rawExp.camera"
             " FROM p2PendingImfile"
             " JOIN p2PendingExp"
             "   USING(exp_tag)"
-            " JOIN rawScienceExp"
+            " JOIN rawExp"
             "   USING(exp_tag)"
             " LEFT JOIN p2Mask"
@@ -353 +353 @@
             "SELECT"
             "   p2ProcessedImfile.*,"
-            "   rawScienceExp.camera"
+            "   rawExp.camera"
             " FROM p2ProcessedImfile"
-            " JOIN rawScienceExp"
+            " JOIN rawExp"
             "   USING(exp_tag)"
             " WHERE "
@@ -554 +554 @@
     // where exp_tag is not in p2PendingImfile
     // where the number of entries in p2ProccessedImfile matches the .imfiles
-    // entry in rawScienceExp
+    // entry in rawExp
     psString query = psStringCopy(
         "SELECT DISTINCT"
         "   p2PendingExp.*,"
-        "   rawScienceExp.imfiles,"
+        "   rawExp.imfiles,"
         "   p2ProcessedImfile.class_id"
         " FROM p2PendingExp"
-        " JOIN rawScienceExp"
-        "   ON p2PendingExp.exp_tag = rawScienceExp.exp_tag"
+        " JOIN rawExp"
+        "   ON p2PendingExp.exp_tag = rawExp.exp_tag"
         " LEFT JOIN p2ProcessedExp"
         "   ON p2PendingExp.exp_tag = p2ProcessedExp.exp_tag"
@@ -575 +575 @@
         " GROUP BY"
         "   p2PendingExp.exp_tag"
-        " HAVING rawScienceExp.imfiles = COUNT(p2ProcessedImfile.class_id)"
+        " HAVING rawExp.imfiles = COUNT(p2ProcessedImfile.class_id)"
         );
 
@@ -773 +773 @@
         pendingExp->p1_version,
         pendingExp->p2_version,
-        pendingExp->label,
-        0   // fault code
+        pendingExp->label
     );
 }