Changeset 35250 for branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Mar 6, 2013, 4:50:14 PM (13 years ago)

Author:

eugene

Message:

get mextract and mmatch to work with a subset metadata file

File:

• branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mextract.c (modified) (3 diffs)

branches/eam_branches/ipp-20130306/Ohana/src/opihi/dvo/mextract.c

@@ -147 +147 @@
     // 3) add the input subset filename to the dvo_client command
 
+    // allocate the temp array and copy all but (RA) (DEC)
+    int targc = 0;
+    char **targv = NULL;
+    ALLOCATE (targv, char *, argc);
+    for (i = 0; i < argc; i++) {
+      targv[targc] = strcreate (argv[i]);
+      targc ++;
+    }
+
     if (loadImages) {
       Image *image;
@@ -154 +163 @@
       char *filename = abspath("image.metadata.fits", DVO_MAX_PATH);
       ImageMetadataSave (filename, image, Nimage);
-      argc += 2;
-      argv[argc-2] = strcreate ("-image-metadata");
-      argv[argc-1] = strcreate (filename);
-    }
-
-    int status = HostTableParallelOps (argc, argv, RESULT_FILE, TRUE, 0, VERBOSE);
+
+      REALLOCATE (targv, char *, targc + 2);
+      targv[targc+0] = strcreate ("-image-metadata");
+      targv[targc+1] = strcreate (filename);
+      targc += 2;
+    }
+
+    // call the remote client
+    int status = HostTableParallelOps (targc, targv, RESULT_FILE, TRUE, 0, VERBOSE);
 
     dbFreeFields (fields, Nfields);
@@ -167 +179 @@
     dvo_catalog_free (&catalog);
 
-    if (loadImages) {
-      free (argv[argc-1]);
-      free (argv[argc-2]);
-    }
+    // free up targv
+    for (i = 0; i < targc; i++) {
+      free (targv[i]);
+    }
+    free (targv);
 
     return status;