Changeset 25703

Timestamp:

Oct 1, 2009, 6:25:14 AM (17 years ago)

Author:

bills

Message:

in -warped mode allow selection by label

Location:

trunk/ippTools/src

Files:

• warptool.c (modified) (1 diff)
• warptoolConfig.c (modified) (1 diff)

trunk/ippTools/src/warptool.c

@@ -1200 +1200 @@
     PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs",  ">=");
     PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawExp.dateobs",  "<=");
-    PXOPT_COPY_STR(config->args, where, "-filter",     "rawExp.filter", "==");
+    PXOPT_COPY_STR(config->args, where, "-filter",    "rawExp.filter", "==");
     PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
+    pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
 
     PXOPT_LOOKUP_U64(magicked, config->args, "-magicked", false, false);

trunk/ippTools/src/warptoolConfig.c

@@ -217 +217 @@
     psMetadataAddTime(warpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0,    "search for exposures by time (>=)", NULL);
     psMetadataAddTime(warpedArgs, PS_LIST_TAIL, "-dateobs_end", 0,      "search for exposures by time (<=)", NULL);
-    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-filter", 0,           "search for filter", NULL);
+    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-filter", 0,           "search for exposures by filter", NULL);
     psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-destreaked",  0,      "search for destreaked images", false);
     psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-not_destreaked",  0,  "search for images that have not been destreaked", false);
     psMetadataAddS64(warpedArgs, PS_LIST_TAIL,  "-magicked", 0,         "search by magicked value", 0);
     psMetadataAddS16(warpedArgs, PS_LIST_TAIL,  "-fault",  0,           "search by fault code", 0);
+    psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-label",  PS_META_DUPLICATE_OK, "search by warpRun label", NULL);
 
     psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);