Changeset 19579 for trunk/Ohana/src/opihi/dvo/avextract.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/avextract.c (modified) (2 diffs)

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

@@ -3 +3 @@
 int avextract (int argc, char **argv) {
   
-  int i, j, n, m, N, Npts, NPTS, last, Nfields, Nreturn, Ncstack, Nstack;
+  int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, mode, VERBOSE;
   char **cstack, name[1024];
@@ -48 +48 @@
   fields = dbCmdlineFields (argc, argv, DVO_TABLE_AVERAGE, &last, &Nfields);
   if (fields == NULL) return (FALSE);
+
+  // 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