Changeset 19579 for trunk/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Sep 16, 2008, 9:16:26 AM (18 years ago)

Author:

eugene

Message:

adding mmextract and supporting api changes to dbCmdlineField.c functions

File:

• trunk/Ohana/src/opihi/dvo/mextract.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -3 +3 @@
 int mextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
+  int i, j, k, m, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
   char **cstack, name[1024];
@@ -50 +50 @@
   if (fields == NULL) return (FALSE);
 
-  // XXX add the skyregion limits as if it were a where statement
+  // examine line for 'where' or 'match to'.  'match to' is forbidden
+  state = dbCmdlineConditions (argc, argv, last, &next);
+  if (state == DVO_DB_CMDLINE_ERROR) goto escape;
+  if (state == DVO_DB_CMDLINE_IS_MATCH) goto escape; // not allowed for mextract
 
   // parse the remainder of the line as a boolean math expression
-  cstack = isolate_elements (argc-last, &argv[last], &Ncstack);
+  cstack = isolate_elements (argc-next, &argv[next], &Ncstack);
   
   // construct the db Boolean math stack (frees cstack)