Changeset 15732 for branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Image.c

Timestamp:

Dec 4, 2007, 12:32:27 PM (19 years ago)

Author:

eugene

Message:

various changes to support the reworked dvo_catalog apis; most important is the better tracking of the disk and memory elements of each table

File:

• branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Image.c (modified) (4 diffs)

branches/eam_branch_20071130/Ohana/src/addstar/src/UpdateDatabase_Image.c

@@ -13 +13 @@
 
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+  if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
   
   // XXX this is probably not needed anymore
@@ -49 +49 @@
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
-    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+    if (options[0].update) catalog.catflags = LOAD_AVES | LOAD_MISS | LOAD_SECF;
 
     // an error exit status here is a significant error
@@ -57 +57 @@
     }
 
-    // Nave_disk == 0 implies an empty catalog file
+    // Naves_disk == 0 implies an empty catalog file
     // for only_match, skip empty catalogs 
-    if ((catalog.Nave_disk == 0) && options[0].only_match) {
+    if ((catalog.Naves_disk == 0) && options[0].only_match) {
       dvo_catalog_unlock (&catalog);
       dvo_catalog_free (&catalog);
@@ -73 +73 @@
     if (!options[0].only_images) {
       SetProtect (TRUE);
-      dvo_catalog_save (&catalog, VERBOSE);
+      if (options[0].update) {
+        dvo_catalog_update (&catalog, VERBOSE);
+      } else {
+        dvo_catalog_save (&catalog, VERBOSE);
+      }
       SetProtect (FALSE);
     }