Changeset 20375

Timestamp:

Oct 24, 2008, 3:01:24 PM (18 years ago)

Author:

eugene

Message:

fix correction queries

Location:

trunk/ippTools

Files:

• share/dettool_stop_completed_correct_runs.sql (modified) (2 diffs)
• src/dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/share/dettool_stop_completed_correct_runs.sql

@@ +1 @@
+-- det1 is the 'correction' detRun, det2 is the 'parent' detRun 
 UPDATE detRun
 SET state = 'stop'
@@ -8 +9 @@
     FROM detRun AS det1
     INNER JOIN detRun as det2
-        ON det1.ref_det_run = det2.det_id 
+        ON det1.ref_det_id = det2.det_id 
         -- do we need to restrict by iteration?  not clear this logic below is right or tested
     JOIN detNormalizedImfile as imfile

trunk/ippTools/src/dettoolConfig.c

@@ -172 +172 @@
     // -makecorrection
     psMetadata *makecorrectionArgs = psMetadataAlloc();
+    psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-det_type",  0,   "set detrend type of corrected detRun", NULL);
     psMetadataAddS64(makecorrectionArgs, PS_LIST_TAIL, "-det_id",  0,     "detRun det_id to be corrected (required)", 0);
     psMetadataAddS32(makecorrectionArgs, PS_LIST_TAIL, "-iteration",  0,  "detRun iteration to be corrected (required)", -1);;
     psMetadataAddBool(makecorrectionArgs, PS_LIST_TAIL, "-simple", 0,            "use the simple output format", false);
+
+    psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-workdir",  0,   "set workdir", NULL);
+    psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-reduction",  0, "set reduction", NULL);
+    psMetadataAddStr(makecorrectionArgs, PS_LIST_TAIL, "-label",  0,     "set label", NULL);
 
     // -tocorrectexp
@@ -184 +189 @@
     psMetadata *tocorrectimfileArgs = psMetadataAlloc();
     psMetadataAddS64(tocorrectimfileArgs, PS_LIST_TAIL, "-det_id", 0,            "search for detrend ID", 0);
+    psMetadataAddStr(tocorrectimfileArgs, PS_LIST_TAIL, "-det_type",  0,   "search by type of corrected detRun", NULL);
     psMetadataAddU64(tocorrectimfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     psMetadataAddBool(tocorrectimfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);