Changeset 25689

Timestamp:

Sep 30, 2009, 1:37:14 PM (17 years ago)

Author:

bills

Message:

add some more selection arguments for -warped mode -not_destreaked -magicked magic_ds_id

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/warptool.c

@@ -1201 +1201 @@
     PXOPT_COPY_TIME(config->args, where, "-dateobs_end",   "rawExp.dateobs",  "<=");
     PXOPT_COPY_STR(config->args, where, "-filter",     "rawExp.filter", "==");
-
-    PXOPT_LOOKUP_BOOL(destreaked, config->args, "-destreaked", false);
-
+    PXOPT_COPY_S64(config->args, where, "-magicked", "warpSkyfile.magicked", "==");
+
+    PXOPT_LOOKUP_U64(magicked, config->args, "-magicked", false, false);
+    PXOPT_LOOKUP_BOOL(destreaked, config->args,     "-destreaked", false);
+    PXOPT_LOOKUP_BOOL(not_destreaked, config->args, "-not_destreaked", false);
+
+    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
-    PXOPT_LOOKUP_BOOL(all, config->args, "-all", false);
 
     // find all rawImfiles matching the default query
@@ -1226 +1229 @@
     psFree(where);
 
+    if (not_destreaked) {
+        if (destreaked) {
+            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -destreaked makes no sense");
+            return false;
+        }
+        if (magicked) {
+            psError(PXTOOLS_ERR_DATA, true, "providing -not_destreaked and -magicked makes no sense");
+            return false;
+        }
+        psStringAppend(&query, " AND warpSkyfile.magicked = 0");
+    }
     if (destreaked) {
         psStringAppend(&query, " AND warpSkyfile.magicked != 0");

trunk/ippTools/src/warptoolConfig.c

@@ -219 +219 @@
     psMetadataAddStr(warpedArgs, PS_LIST_TAIL,  "-filter", 0,           "search for 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);
+
+    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all",  0,             "search without arguments", false);
     psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
-    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-all",  0,             "list everything", false);
     psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple",  0,          "use the simple output format", false);