Changeset 14043

Timestamp:

Jul 6, 2007, 11:43:19 AM (19 years ago)

Author:

jhoblitt

Message:

fix duplicate return of *.camera in dettool -toprocessedimfile

Location:

trunk/ippTools

Files:

• scripts/dettest.sh (modified) (1 diff)
• share/Makefile.am (modified) (1 diff)
• share/dettool_toprocessedimfile.sql (added)
• src/dettool.c (modified) (1 diff)

trunk/ippTools/scripts/dettest.sh

@@ -10 +10 @@
 
 dettool -raw || exit 1
+
+dettool -toprocessedimfile || exit 1
 
 for ID in `seq 0 3` ; do

trunk/ippTools/share/Makefile.am

@@ -14 +14 @@
         dettool_find_completed_runs.sql \
         dettool_raw.sql \
+    dettool_toprocessedimfile.sql \
         difftool_inputskyfile.sql \
         difftool_skyfile.sql \

trunk/ippTools/src/dettool.c

@@ -2113 +2113 @@
     }
 
-    // select det_id, det_type & rawImfile *
-    // get det_id from detInputExp.det_id
-    // get det_type from detRun.det_id
-    //
-    // det_id is in detInputExp
-    // exp_id is in detInputExp
-    // det_id is not in detProccessedImfile
-    // exp_id is not in detProccessedImfile
-    // class_is is not in detProccessedImfile
-    psString query = psStringCopy(
-            "SELECT"
-            "   detRun.det_id,"
-            "   detRun.det_type,"
-            "   detRun.workdir,"
-            "   detRun.reduction,"
-            "   rawImfile.*,"
-            "   rawExp.camera"
-            " FROM detRun"
-            " JOIN detInputExp"
-            "    USING(det_id, iteration)"
-            " JOIN rawExp"
-            "    ON detInputExp.exp_id = rawExp.exp_id"
-            " JOIN rawImfile"
-            "    ON detInputExp.exp_id = rawImfile.exp_id"
-            " LEFT JOIN detProcessedImfile"
-            "   ON detInputExp.det_id = detProcessedImfile.det_id"
-            "   AND rawImfile.exp_id = detProcessedImfile.exp_id"
-            "   AND rawImfile.class_id = detProcessedImfile.class_id"
-            " WHERE"
-            "   detRun.state = 'run'"
-            "   AND detRun.mode = 'master'"
-            "   AND detProcessedImfile.det_id IS NULL"
-            "   AND detProcessedImfile.exp_id IS NULL"
-            "   AND detProcessedImfile.class_id IS NULL"
-        );
+    psString query = pxDataGet("dettool_toprocessedimfile.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     if (config->where) {