Changeset 6836

Timestamp:

Apr 11, 2006, 5:23:48 PM (20 years ago)

Author:

jhoblitt

Message:

cleaned up

File:

• trunk/ippTools/src/pzgetexpConfig.c (modified) (2 diffs)

trunk/ippTools/src/pzgetexpConfig.c

@@ -11 +11 @@
     }
 
-    int N;
-    config->mode = PX_MODE_NONE;
-    if ((N = psArgumentGet (argc, argv, "-seen"))) {
-        psArgumentRemove (N, &argc, argv);
-        if (config->mode) {
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed");
-        }
-        config->mode = PX_MODE_SEEN;
-    }
-    if ((N = psArgumentGet (argc, argv, "-pending"))) {
-        psArgumentRemove (N, &argc, argv);
-        if (config->mode) {
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed");
-        }
-        config->mode = PX_MODE_PENDING;
-    }
-    if ((N = psArgumentGet (argc, argv, "-copydone"))) {
-        psArgumentRemove (N, &argc, argv);
-        if (config->mode) {
-            psError(PS_ERR_UNKNOWN, true, "only one mode selection is allowed");
-        }
-        config->mode = PX_MODE_COPYDONE;
-    }
-    
-    // paul's argument parsing convention requires: -key value 
-    // Parse other command-line arguments
     psMetadata *args = psMetadataAlloc();
-    psMetadataAddStr(args , PS_LIST_TAIL, "-seen", 0,
-        "list all uncopied exposure IDs", "");
-    psMetadataAddStr(args , PS_LIST_TAIL, "-pending",  0,
-        "list all image files pending download", "");
-    psMetadataAddStr(args , PS_LIST_TAIL, "-copydone",  0,
-        "indicate that an image file has been downloaded", "");
-
-    // -copydone search
-    psMetadata *copydoneArgs = psMetadataAlloc();
-    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-exp_id",  0,
-        "define exposure ID", "");
-    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class",  0,
-        "define class", "");
-    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-class_id",  0,
-        "define class_id", "");
-    psMetadataAddStr(copydoneArgs, PS_LIST_TAIL, "-suri",  0,
-        "define storage uri", "");
+    psMetadataAddStr(args , PS_LIST_TAIL, "-uri", 0,
+        "DataStore product URI", "");
+    psMetadataAddStr(args , PS_LIST_TAIL, "-inst", 0,
+        "camera name", "");
+    psMetadataAddStr(args , PS_LIST_TAIL, "-telescope",  0,
+        "telescope name", "");
 
     bool argErr = false;
-    if (config->mode == PX_MODE_NONE) {
-        argErr = true;
-        fprintf (stderr, "mode argument is required\n");
-    } else if (! psArgumentParse(args, &argc, argv) || argc != 1) {
+    if (! psArgumentParse(args, &argc, argv) || argc != 2) {
         argErr = true;
         fprintf (stderr, "error parsing arguments\n");
@@ -67 +27 @@
     if (argErr) {
         printf("\nPan-STARRS Phase Z Search Tool\n");
-        printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : -seen | -pending | -copydone\n\n");
-        fprintf (stdout, "-copydone ");
-        psArgumentHelp(copydoneArgs);
+        printf("Usage: %s -uri -inst -telescope\n\n", argv[0]);
+        psArgumentHelp(args);
         psFree(args);
-        psFree(copydoneArgs);
         exit(EXIT_FAILURE);
     }
 
-    psFree(copydoneArgs);
-
-    // XXX why is "" being returned when -[foo] isn't specified?
-#define EMPTY_TO_NULL_STRING(var) \
-    if (var != NULL && strcmp(var, "") == 0) { \
-        var = NULL; \
-    }
-
     config->args = args;
-
-if (config->mode == PX_MODE_COPYDONE) {
-    psMetadata *where = psMetadataAlloc();
-
-    bool status;
-    psString str;
-    if ((str = psMetadataLookupStr(&status, args, "-exp_id"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "exp_id", 0, "==", str)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
-            psFree(where);
-            return NULL;
-        }
-    }
-    if ((str = psMetadataLookupStr(&status, args, "-class"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "class", 0, "==", str)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-            psFree(where);
-            return NULL;
-        }
-    }
-    if ((str = psMetadataLookupStr(&status, args, "-class_id"))) {
-        if (!psMetadataAddStr(where, PS_LIST_TAIL, "class_id", 0, "==", str)) {
-            psError(PS_ERR_UNKNOWN, false, "failed to add item class_id");
-            psFree(where);
-            return NULL;
-        }
-    }
-
-    if (where->list->n < 1) {
-        psFree(where);
-        where = NULL;
-    }
-    config->where = where;
-}
 
     // define Database handle, if used