Changeset 25775 for trunk/ippTools/src/warptool.c

Timestamp:

Oct 5, 2009, 2:15:48 PM (17 years ago)

Author:

bills

Message:

For the lookup modes add arguments to lookup by ra, decl

File:

• trunk/ippTools/src/warptool.c (modified) (3 diffs)

trunk/ippTools/src/warptool.c

@@ -1204 +1204 @@
     pxAddLabelSearchArgs (config, where, "-label",   "warpRun.label", "LIKE");
 
-    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);
 
@@ -1220 +1216 @@
     }
 
+    // generate where strings for arguments that require extra processing
+    // beyond PXOPT_COPY*
+    psString where2 = NULL;
+    if (!pxmagicAddWhere(config, &where2, "warpSkyfile")) {
+        psError(PXTOOLS_ERR_DATA, false, "pxMagicAddWhere failed");
+        return false;
+    }
+    if (!pxspaceAddWhere(config, &where2, "rawExp")) {
+        psError(PXTOOLS_ERR_DATA, false, "pxSpaceAddWhere failed");
+        return false;
+    }
+
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
-    } else if (!all) {
+    } else if (!all && !where2) {
         psError(PXTOOLS_ERR_DATA, true, "search parameters or -all are required");
         return false;
@@ -1230 +1238 @@
     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");
+    if (where2) {
+        psStringAppend(&query, where2);
     }