Changeset 26033

Timestamp:

Nov 4, 2009, 3:56:22 PM (17 years ago)

Author:

bills

Message:

in magicttool -definebyquery if -rerun queue a new run only if there isn't already
a run with the given label.
Require label

Location:

trunk/ippTools

Files:

• share/magictool_definebyquery_select.sql (modified) (1 diff)
• src/magictool.c (modified) (2 diffs)
• src/magictoolConfig.c (modified) (1 diff)

trunk/ippTools/share/magictool_definebyquery_select.sql

@@ -1 +1 @@
 -- Get a list of exposures on which magic may be performed
-SELECT
+SELECT DISTINCT
     exp_id,
     MAX(diffWarps.diff_id) AS diff_id,

trunk/ippTools/src/magictool.c

@@ -114 +114 @@
     // Required
     PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-label", true, false);
 
     // Optional
-    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
     PXOPT_LOOKUP_STR(data_group, config->args, "-data_group", false, false);
     PXOPT_LOOKUP_STR(note, config->args, "-note", false, false);
@@ -151 +151 @@
         // what if no skycells for the diff run completed?
 
-        if (!rerun) {
-            psStringAppend(&queryWhereStr, "\n%s magic_id IS NULL", queryWhereStr ? "AND" : "WHERE");
+        psStringAppend(&queryWhereStr, "\n%s (magic_id IS NULL", queryWhereStr ? "AND" : "WHERE");
+        if (rerun) {
+            psStringAppend(&queryWhereStr, " OR magicRun.label != '%s')", label);
+        } else {
+            psStringAppend(&queryWhereStr, ") ");
         }
 

trunk/ippTools/src/magictoolConfig.c

@@ -50 +50 @@
     psMetadata *definebyqueryArgs = psMetadataAlloc();
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir",     0, "define workdir (required)", NULL);
-    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",       0, "define label", NULL);
+    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",       0, "define label (required)", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-dvodb",       0, "define dvodb", NULL);
     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered", 0, "time detrend run was registered", now);