Changeset 20873 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/mmextract.c

Timestamp:

Dec 2, 2008, 6:24:28 PM (18 years ago)

Author:

eugene

Message:

fixes for interger-type vectors; finish imextract upgrade

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/mmextract.c (modified) (6 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/mmextract.c

@@ -13 +13 @@
   Catalog catalog;
   SkyList *skylist;
-  PhotCode *code;
   Vector **vec;
   dbField *fields;
@@ -21 +20 @@
 
   /* defaults */
-  skylist = NULL;
-  code = NULL;
-  fields = NULL;
+  vec = NULL;
   stack1 = NULL;
   stack2 = NULL;
+  fields = NULL;
+  values = NULL;
+  skylist = NULL;
+  selection = NULL;
 
   if ((N = get_argument (argc, argv, "-h"))) goto help;
@@ -57 +58 @@
   // parse the fields to be extracted and returned : last points to end, or first 'where' or 'matched'
   fields = dbCmdlineFields (argc, argv, DVO_TABLE_MEASURE, &last, &Nfields);
-  if (fields == NULL) return (FALSE);
+  if (fields == NULL) goto escape;
+  if (Nfields == 0) {
+    FreeSkyRegionSelection (selection);
+    dbFreeFields (fields, Nfields);
+    dvo_catalog_free (&catalog);
+    goto help;
+  }
 
   // examine line for 'where' and 'match to'.  neither is required, but order is fixed
@@ -298 +305 @@
 
 escape:
+  if (vec) free (vec);
+  if (values) free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack1, Nstack1);
@@ -310 +319 @@
 
  help:
-  gprint (GP_ERR, "USAGE: mextract field[,field,field...] where (expression)\n");
+  gprint (GP_ERR, "USAGE: mmextract field[,field,field...] where (expression) match to (expression)\n");
+  gprint (GP_ERR, "  pairs of fields are returned: the first set are restricted by the 'where' expression, the second by the 'match to' expression\n");
 
   if ((argc > N + 1) && !strcasecmp (argv[N+1], "fields")) {
@@ -362 +372 @@
     return (FALSE);
   }
-  gprint (GP_ERR, " mextract --help fields : for a complete listing of allowed fields\n");
+  gprint (GP_ERR, " mmextract --help fields : for a complete listing of allowed fields\n");
   return (FALSE);
 }