Changeset 6715 for trunk/psphot/src/psphotArguments.c

Timestamp:

Mar 27, 2006, 4:31:17 PM (20 years ago)

Author:

eugene

Message:

substantial work on the pmFPAfile,view concepts

File:

• trunk/psphot/src/psphotArguments.c (modified) (7 diffs)

trunk/psphot/src/psphotArguments.c

@@ -2 +2 @@
 # include <glob.h>
 
-static void usage (void);
+static void usage (void) {
+    fprintf (stderr, "USAGE: psphot [-file image(s)] [-list imagelist] (output)\n");
+    exit (2);
+}
 
 pmConfig *psphotArguments (int *argc, char **argv) {
@@ -99 +102 @@
 
     // load config data from default locations 
-    pmConfig *config = pmConfigRead(argc, argv, PSPHOT_RECIPE);
+    pmConfig *config = pmConfigRead(argc, argv);
 
     // Storage for other command-line arguments
@@ -105 +108 @@
 
     // save these recipe options until we have loaded the options
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSPHOT.OPTIONS",  PS_META_REPLACE, "", options);
+    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSPHOT.OPTIONS",  PS_DATA_METADATA, "", options);
+    psFree (options);
 
     // chip selection is used to limit chips to be processed
     if ((N = psArgumentGet (*argc, argv, "-chip"))) {
         psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTION", PS_META_REPLACE, "", argv[N]);
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTION", PS_DATA_STRING, "", psStringCopy(argv[N]));
         psArgumentRemove (N, argc, argv);
     }
@@ -116 +120 @@
     // we load all input files onto a psArray, to be parsed later
     psArray *input = psArrayAlloc (16);
+    input->n = 0;
 
     // load the list of filenames the supplied file (may be a glob: "file*.fits")
@@ -126 +131 @@
             char *filename = psStringCopy (globList.gl_pathv[i]);
             psArrayAdd (input, 16, filename);
+            psFree (filename);
         }
         psArgumentRemove (N, argc, argv);
@@ -150 +156 @@
                 filename = psStringCopy (word);
                 psArrayAdd (input, 16, filename);
+                psFree (filename);
                 break;
               default:
@@ -162 +169 @@
 
     // input list gets places as an array on the config->arguements list
-    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "INPUT",  PS_META_REPLACE, "", input);
+    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "INPUT",  PS_DATA_ARRAY, "", input);
+    psFree (input);
 
     if (*argc != 2) usage ();
 
-    // input and output positions are fixed
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", PS_META_REPLACE, "", argv[1]);
+    // output position is fixed
+    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
 
     psTrace(__func__, 1, "Done with psphotArguments...\n");
     return (config);
 }
-
-static void usage (void) {
-    fprintf (stderr, "USAGE: psphot [-file image(s)] [-list imagelist] (output)\n");
-    exit (2);
-}