Changeset 38352 for branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c

Timestamp:

Jun 2, 2015, 12:37:17 PM (11 years ago)

Author:

eugene

Message:

rename some dvo-internal structures and enums to enable macro-ization and to avoid namespace collisions

File:

• branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c (modified) (4 diffs)

branches/eam_branches/ohana.20150429/src/addstar/src/UpdateDatabase_Image.c

@@ -12 +12 @@
   }
 
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+  catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+  if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
   
   // XXX this is probably not needed anymore
@@ -47 +47 @@
     catalog.filename  = skylist[0].filename[i];
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-    catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
+    if (options[0].update) catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
 
     // an error exit status here is a significant error
@@ -56 +56 @@
     }
 
-    // Naves_disk == 0 implies an empty catalog file
+    // Naverage_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs 
-    if ((catalog.Naves_disk == 0) && options[0].only_match) {
+    if ((catalog.Naverage_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -73 +73 @@
       SetProtect (TRUE);
       if (options[0].update) {
-        catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+        catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
         dvo_catalog_update (&catalog, VERBOSE);
       } else {