Changeset 10162

Timestamp:

Nov 22, 2006, 4:44:39 PM (20 years ago)

Author:

jhoblitt

Message:

update -toresidimfile to handle verify mode

File:

• trunk/ippTools/src/dettool.c (modified) (7 diffs)

trunk/ippTools/src/dettool.c

@@ -1685 +1685 @@
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -2384 +2384 @@
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -2581 +2581 @@
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -2903 +2903 @@
         " HAVING"
         "    COUNT(detNormalizedImfile.class_id) = COUNT(rawImfile.class_id)"
-        );
-
-    // XXX does it make sens to accept any search params?
+    );
+
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -3248 +3248 @@
 
     psString query = psStringCopy(
-        "SELECT DISTINCT"
-        "   detRun.iteration,"
-        "   detRun.det_type,"
-        "   detProcessedImfile.*,"
-        "   detNormalizedImfile.uri AS det_uri,"
-        "   rawDetrendExp.camera"
-        " FROM detRun"
-        " JOIN detInputExp"
-        "   ON detRun.det_id = detInputExp.det_id"
-        "   AND detRun.iteration = detInputExp.iteration"
-        " JOIN rawDetrendExp"
-        "   ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
-        " JOIN detProcessedImfile"
-        "   ON detRun.det_id = detProcessedImfile.det_id"
-        "   AND detInputExp.exp_tag = detProcessedImfile.exp_tag"
-        " JOIN detNormalizedImfile"
-        "   ON detRun.det_id = detNormalizedImfile.det_id"
-        "   AND detRun.iteration = detNormalizedImfile.iteration"
-        "   AND detProcessedImfile.class_id = detNormalizedImfile.class_id"
-        " LEFT JOIN detResidImfile"
-        "   ON detRun.det_id = detResidImfile.det_id"
-        "   AND detRun.iteration = detResidImfile.iteration"
-        "   AND detProcessedImfile.exp_tag = detResidImfile.exp_tag"
-        "   AND detProcessedImfile.class_id = detResidImfile.class_id"
-        " WHERE"
-        "   detRun.state = 'run'"
-        "   AND detRun.mode = 'master'"
-        "   AND detResidImfile.det_id IS NULL"
-        "   AND detResidImfile.iteration IS NULL"
-        "   AND detResidImfile.exp_tag IS NULL"
-        "   AND detResidImfile.class_id IS NULL"
+        "SELECT DISTINCT\n"
+        "   detRun.det_id,\n"
+        "   detRun.iteration,\n"
+        "   detRun.det_type,\n"
+        "   detRun.mode,\n"
+        "   detProcessedImfile.exp_tag,\n"
+        "   detProcessedImfile.class_id,\n"
+        "   detProcessedImfile.uri,\n"
+        "   detNormalizedImfile.uri AS det_uri,\n"
+        "   rawDetrendExp.camera\n"
+        " FROM detRun\n"
+        " JOIN detInputExp\n"
+        "   ON detRun.det_id = detInputExp.det_id\n"
+        "   AND detRun.iteration = detInputExp.iteration\n"
+        " JOIN rawDetrendExp\n"
+        "   ON detInputExp.exp_tag = rawDetrendExp.exp_tag\n"
+        " JOIN detProcessedImfile\n"
+        "   ON detRun.det_id = detProcessedImfile.det_id\n"
+        "   AND detInputExp.exp_tag = detProcessedImfile.exp_tag\n"
+        " JOIN detNormalizedImfile\n"
+        "   ON detRun.det_id = detNormalizedImfile.det_id\n"
+        "   AND detRun.iteration = detNormalizedImfile.iteration\n"
+        "   AND detProcessedImfile.class_id = detNormalizedImfile.class_id\n"
+        " LEFT JOIN detResidImfile\n"
+        "   ON detRun.det_id = detResidImfile.det_id\n"
+        "   AND detRun.iteration = detResidImfile.iteration\n"
+        "   AND detProcessedImfile.exp_tag = detResidImfile.exp_tag\n"
+        "   AND detProcessedImfile.class_id = detResidImfile.class_id\n"
+        " WHERE\n"
+        "   detRun.state = 'run'\n"
+        "   AND detRun.mode = 'master'\n"
+        "   AND detResidImfile.det_id IS NULL\n"
+        "   AND detResidImfile.iteration IS NULL\n"
+        "   AND detResidImfile.exp_tag IS NULL\n"
+        "   AND detResidImfile.class_id IS NULL\n"
+        " UNION"
+        " SELECT\n"
+        "   detRun.det_id,\n"
+        "   detRun.iteration,\n"
+        "   detRun.det_type,\n"
+        "   detRun.mode,\n"
+        "   rawImfile.exp_tag,\n"
+        "   rawImfile.class_id,\n"
+        "   rawImfile.uri,\n"
+        "   rawImfile.uri AS det_uri,\n"
+        "   rawDetrendExp.camera\n"
+        " FROM detRun\n"
+        " JOIN detInputExp\n"
+        "    USING(det_id, iteration)\n"
+        " JOIN rawDetrendExp\n"
+        "    ON detInputExp.exp_tag = rawDetrendExp.exp_tag\n"
+        " JOIN rawImfile\n"
+        "    ON detInputExp.exp_tag = rawImfile.exp_tag\n"
+        " LEFT JOIN detProcessedImfile\n"
+        "   ON detInputExp.det_id = detProcessedImfile.det_id\n"
+        "   AND rawImfile.exp_tag = detProcessedImfile.exp_tag\n"
+        "   AND rawImfile.class_id = detProcessedImfile.class_id\n"
+        " WHERE\n"
+        "   detRun.state = 'run'\n"
+        "   AND detRun.mode = 'verify'\n"
+        "   AND detProcessedImfile.det_id IS NULL\n"
+        "   AND detProcessedImfile.exp_tag IS NULL\n"
+        "   AND detProcessedImfile.class_id IS NULL\n"
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -3791 +3823 @@
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {
@@ -4250 +4282 @@
         );
 
-    // XXX does it make sens to accept any search params?
+    // XXX does it make sense to accept any search params?
 #if 0
     if (config->where) {