Changeset 14078

Timestamp:

Jul 9, 2007, 10:29:40 AM (19 years ago)

Author:

jhoblitt

Message:

fix -todetrunsummary so that it masks out when an entry is added to the detRunSummary table

Location:

trunk/ippTools

Files:

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

trunk/ippTools/scripts/dettest.sh

@@ -56 +56 @@
 dettool -addresidexp -det_id $det_id -exp_id 2 -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -path_base jpeg1 -reject || exit 1
 
-dettool -residdetrun || exit 1
+dettool -todetrunsummary || exit 1
 dettool -residexp || exit 1
 dettool -updateresidexp -det_id $det_id -iteration 0 -recip yourrecipe || exit 1
@@ -63 +63 @@
 
 dettool -adddetrunsummary -det_id $det_id -iteration 0 -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -accept || exit 1
+
+dettool -todetrunsummary || exit 1
+
 dettool -residexp || exit 1
 

trunk/ippTools/share/Makefile.am

@@ -13 +13 @@
         dettool_find_completed_runs.sql \
         dettool_raw.sql \
+        dettool_todetrunsummary.sql \
         dettool_tonormalizedexp.sql \
         dettool_tonormalizedstat.sql \
         dettool_toprocessedexp.sql \
-    dettool_toprocessedimfile.sql \
+        dettool_toprocessedimfile.sql \
         dettool_toresidexp.sql \
         dettool_toresidimfile.sql \

trunk/ippTools/src/dettool.c

@@ -5272 +5272 @@
      */
 
-    // select detRun.det_id
-    // select detRun.iteration
-    // select detRun.det_type
-    // by:
-    // find the current iteration bassed on det_id
-    // find all exp_ids in the current det_id/iteration from detInputExp
-    // find all exp_ids in the current det_id/iteration from detResidExp
-    // compare the counts of exp_ids
-
-    psString query = psStringCopy(
-        "SELECT DISTINCT\n"
-        "   det_id,\n"
-        "   iteration,\n"
-        "   det_type,\n"
-        "   mode,\n"
-        "   workdir,\n"
-        "   camera\n"
-        " FROM\n"
-        "   (SELECT DISTINCT\n"
-        "       detRun.det_id,\n"
-        "       detRun.iteration,\n"
-        "       detRun.det_type,\n"
-        "       detRun.mode,\n"
-        "       detRun.workdir,\n"
-        "       detInputExp.exp_id,\n"
-        "       rawExp.camera\n"
-        "   FROM detRun\n"
-        "   JOIN detInputExp\n"
-        "       USING(det_id, iteration)\n"
-        "   JOIN rawExp\n"
-        "       ON detInputExp.exp_id = rawExp.exp_id\n"
-        "   LEFT JOIN detResidExp\n"
-        "       ON detRun.det_id = detResidExp.det_id\n"
-        "       AND detRun.iteration = detResidExp.iteration\n"
-        "       AND detInputExp.exp_id = detResidExp.exp_id\n"
-        "   WHERE\n"
-        "       detRun.state = 'run'\n"
-        "   GROUP BY\n"
-        "       detRun.det_id,\n"
-        "       detRun.iteration\n"
-        "   HAVING\n"
-        "       COUNT(detResidExp.exp_id) = COUNT(detInputExp.exp_id)\n"
-        " ) AS Foo\n"
-        );
+    psString query = pxDataGet("dettool_todetrunsummary.sql");
+    if (!query) {
+        psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
+        return false;
+    }
 
     // XXX does it make sense to accept any search params?