Changeset 20862 for branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h

Timestamp:

Dec 1, 2008, 4:25:00 AM (18 years ago)

Author:

eugene

Message:

finish imextract conversion to SQL style syntax

File:

• branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h (modified) (4 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h

@@ -138 +138 @@
       IMAGE_RA, 
       IMAGE_DEC, 
-      IMAGE_Xm, 
+      IMAGE_GLON, 
+      IMAGE_GLAT, 
+      IMAGE_ELON, 
+      IMAGE_ELAT, 
+      IMAGE_XM, 
       IMAGE_AIRMASS, 
       IMAGE_MCAL, 
@@ -175 +179 @@
 };
 
-enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE};
+enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
 enum {DVO_DB_CMDLINE_ERROR, DVO_DB_CMDLINE_IS_END, DVO_DB_CMDLINE_IS_WHERE, DVO_DB_CMDLINE_IS_MATCH}; 
 
@@ -308 +312 @@
 dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
 dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
-void         dbExtractMeasuresInit  PROTO(());
+dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
 
 void         dbInitField            PROTO((dbField *field));
@@ -322 +326 @@
 int wordhash (char *word);
 
-int dbExtractAverageInitTransform (CoordTransformSystem target);
-int dbExtractAverageInit ();
-
 int dbExtractMeasuresInitTransform (CoordTransformSystem target);
 int dbExtractMeasuresInitAve ();
 int dbExtractMeasuresInitMeas ();
+int dbExtractMeasuresInit ();
 
 int dbExtractAveragesInitTransform (CoordTransformSystem target);
 int dbExtractAveragesInit ();
 
+int dbExtractImagesInitTransform (CoordTransformSystem target);
+int dbExtractImagesInit ();
+int dbExtractImagesReset ();
+
 # endif