Changeset 7002

Timestamp:

Apr 28, 2006, 5:02:32 PM (20 years ago)

Author:

Paul Price

Message:

Bad file names are set to NULL.

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (1 diff)
• ppMergeConfig.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -15 +15 @@
     for (int i = 0; i < filenames->n; i++) {
         psString name = filenames->data[i]; // The name of the file
+        if (!name || strlen(name) == 0) {
+            continue;
+        }
         psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
         if (!inFile) {

trunk/ppMerge/src/ppMergeConfig.c

@@ -40 +40 @@
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "-onoff", 0, "Number of on/off pairs", 0);
 
-    // We require an input file set
-    bool status = pmConfigFileSetsMD(config->arguments, argc, argv, "INPUT", "-files", "-list");
-    if (!status) {
-        usage(argv[0]);
-    }
-
-    // Parse other arguments
+    // Parse the arguments
     if (! psArgumentParse(config->arguments, argc, argv) || *argc != 2) {
         usage(argv[0]);
     }
 
-    // Add the input and output images (which remain on the command-line) to the arguments list
+    // Add the output image to the arguments list
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image", argv[1]);
 
-    // The input images are required.  The first one defines the camera.
-    status = false;
-    pmFPAfileFromArgs(&status, config, "PPMERGE.INPUT", "INPUT");
-    if (!status) {
-        usage(argv[0]);
+    // Everything remaining must be input files
+    if (*argc - 2 <= 1) {
+        psError(PS_ERR_IO, true, "No files to combine.\n");
+        exit(EXIT_FAILURE);
     }
-
+    psArray *files = psArrayAlloc(*argc - 2);
+    for (int i = 2; i < *argc; i++) {
+        files->data[i] = psStringCopy(argv[i]);
+    }
+    psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "INPUT", PS_DATA_ARRAY,
+                     "Array of inputs images", files);
 
 #if 0