Changeset 16170 for trunk/ippTools/src/pzgetexp.c

Timestamp:

Jan 20, 2008, 3:48:37 PM (18 years ago)

Author:

eugene

Message:

merging changes from JHs end_stage branch (new end_stage field and related features; substantial cleanup via macros)

File:

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

trunk/ippTools/src/pzgetexp.c

@@ -69 +69 @@
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    bool status = false;
-    psString camera = psMetadataLookupStr(&status, config->args, "-inst");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
-        return false;
-    }
-    if (!camera) {
-        psError(PS_ERR_UNKNOWN, true, "-inst is required");
-        return false;
-    }
-
-    psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
-        return false;
-    }
-    if (!telescope) {
-        psError(PS_ERR_UNKNOWN, true, "-telescope is required");
-        return false;
-    }
+    // required
+    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
+    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
+    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
 
     // find last fileset/exp_name (if we have one)
@@ -119 +103 @@
     // invoke dsproductls
     // dsproductls --uri <> --last_fileset <>
-    psString uri = psMetadataLookupStr(&status, config->args, "-uri");
     psString cmd = NULL;
     if (haveLastFileSet) {
@@ -275 +258 @@
     // these are constants for all records parsed -- look them up before we do
     // any work
-    bool status = false;
-    char *camera = psMetadataLookupStr(&status, config->args, "-inst");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup item '-inst'");
-        return NULL;
-    }
-    char *telescope = psMetadataLookupStr(&status, config->args, "-telescope");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup item '-telescope'");
-        return NULL;
-    }
+    // required
+    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
+    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
 
     // split the string into lines