Changeset 26911

Timestamp:

Feb 11, 2010, 11:11:47 AM (16 years ago)

Author:

bills

Message:

add -destreaked as paramter to -definebyquery to block queing of addRuns
until the camera run has had magic applied.
Remove -all as an option because it is "TOO DANGEROUS"

Location:

trunk/ippTools/src

Files:

• addtool.c (modified) (3 diffs)
• addtoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/addtool.c

@@ -101 +101 @@
     PXOPT_COPY_STR(config->args, where,  "-reduction", "camRun.reduction", "==");
 
-    if (!psListLength(where->list) &&
-        !psMetadataLookupBool(NULL, config->args, "-all")) {
+    if (!psListLength(where->list)) {
         psFree(where);
         psError(PXTOOLS_ERR_DATA, false, "search parameters are required");
@@ -115 +114 @@
     PXOPT_LOOKUP_STR(note,        config->args, "-set_note", false, false);
     PXOPT_LOOKUP_BOOL(image_only, config->args, "-image_only", false);
+    PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false);
     PXOPT_LOOKUP_BOOL(pretend,    config->args, "-pretend", false);
     PXOPT_LOOKUP_BOOL(simple,     config->args, "-simple", false);
@@ -133 +133 @@
     }
     psFree(where);
+
+    if (destreaked) {
+        psStringAppend(&query, " AND (camRun.magicked > 0)");
+    }
 
     if (!p_psDBRunQuery(config->dbh, query)) {

trunk/ippTools/src/addtoolConfig.c

@@ -53 +53 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by camRun label", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",          0, "search by camRun reduction class", NULL);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-destreaked",           0, "only queue destreaked runs", false);
 
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir",        0, "define workdir", NULL);
@@ -65 +66 @@
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_dist_group", 0,   "define new dist_group", NULL);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_note", 0,         "define new note", NULL);
-    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-all",               0, "allow everything to be queued without search terms", false);
 
     // -updaterun