Changeset 13454 for branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbFields.c

Timestamp:

May 21, 2007, 3:38:16 PM (19 years ago)

Author:

eugene

Message:

boolean db extractions now working

File:

• branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbFields.c (modified) (7 diffs)

branches/kapa-mods-2007-05/Ohana/src/opihi/dvo/dbFields.c

@@ +1 @@
+# include "dvoshell.h"
+
+dbInitField (dbField *field) {
+  field->name = NULL;
+  field->extract = FALSE;
+  field->table = 0;
+  field->ID = 0;
+  field->magMode = 0;
+  field->photcode = NULL;
+}
 
 int GetMagMode (char *string) {
@@ -14 +24 @@
 }
 
-PhotCode *ParsePhotcodeField (char *field, int *mode, int default) {
+PhotCode *ParsePhotcodeField (char *field, int *mode, int defMode) {
 
   char *tmpstring, *p;
   PhotCode *code;
 
-  *mode = default;
+  *mode = defMode;
 
   p = strchr (field, ':');
@@ -39 +49 @@
   field->magMode = (M); \
   field->photcode = NULL; \
-  return (TRUE);
+  return (TRUE); }
 
-int ParseMeasureField (dvoField *field, char *fieldName) {
+int ParseMeasureField (dbField *field, char *fieldName) {
 
+  int mode;
   PhotCode *code;
 
@@ -69 +80 @@
 
   // check for code:mode in photcode name 
-  code = ParsePhotcodeField (&mode, MAG_REL);
+  code = ParsePhotcodeField (fieldName, &mode, MAG_REL);
   if (code == NULL) return (FALSE);
 
@@ -83 +94 @@
 }
   
-int ParseAverageField (char *fieldName) {
+int ParseAverageField (dbField *field, char *fieldName) {
 
+  int mode;
   PhotCode *code;
 
   field->table = DVO_TABLE_AVERAGE;
+  field->name  = strcreate (fieldName);
 
   if (!strcasecmp (fieldName, "RA"))    ESCAPE (AVE_RA,        MAG_NONE);
@@ -100 +113 @@
   if (!strcasecmp (fieldName, "dPAR"))  ESCAPE (AVE_PAR_ERR,   MAG_NONE);
   if (!strcasecmp (fieldName, "MAG"))   ESCAPE (AVE_MAG,       MAG_AVE);
-  if (!strcasecmp (fieldName, "dMAG"))  ESCAPE (AVE_dMAG,      MAG_AVE_ERR);
+  if (!strcasecmp (fieldName, "dMAG"))  ESCAPE (AVE_dMAG,      MAG_ERR);
   if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS,     MAG_NONE);
   if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS,     MAG_NONE);
@@ -114 +127 @@
 
   // check for code:mode in photcode name 
-  code = ParsePhotcodeField (&mode, MAG_AVE);
+  code = ParsePhotcodeField (fieldName, &mode, MAG_AVE);
   if (code == NULL) return (FALSE);
 
   // need to distinguish phot, sys errors and scatter
   if (mode == MAG_ERR) {
-    field->ID = MEAS_dMAG;
+    field->ID = AVE_dMAG;
   } else {
-    field->ID = MEAS_MAG;
+    field->ID = AVE_MAG;
   }