Changeset 25545

Timestamp:

Sep 24, 2009, 1:50:20 PM (17 years ago)

Author:

bills

Message:

require a label with -censorrun -exp_id to distinguish multiple magic runs for the same exposure

Location:

trunk/ippTools/src

Files:

• magictool.c (modified) (1 diff)
• magictoolConfig.c (modified) (1 diff)

trunk/ippTools/src/magictool.c

@@ -1399 +1399 @@
     psMetadata *where = psMetadataAlloc();
 
+    PXOPT_LOOKUP_S64(magic_id, config->args, "-magic_id", false, false);
+    PXOPT_LOOKUP_S64(exp_id, config->args, "-exp_id", false, false);
+    PXOPT_LOOKUP_STR(label, config->args, "-label", false, false);
+
+    if (!magic_id) {
+        if (!exp_id && !label) {
+            psError(PS_ERR_UNKNOWN, true, "either -magic_id or exp_id and label is required");
+            return false;
+        }
+    }
+
     // at least one of these required
     PXOPT_COPY_S64(config->args, where, "-magic_id", "magic_id", "==");
     PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+    PXOPT_COPY_STR(config->args, where, "-label", "label", "==");
 
     if (!psListLength(where->list)) {

trunk/ippTools/src/magictoolConfig.c

@@ -165 +165 @@
     psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-magic_id", 0, "define magictool ID", 0);
     psMetadataAddS64(censorrunArgs, PS_LIST_TAIL, "-exp_id", 0, "define exposure ID", 0);
+    psMetadataAddStr(censorrunArgs, PS_LIST_TAIL, "-label",       0, "define label", NULL);
 
     psFree(now);