Changeset 8391

Timestamp:

Aug 16, 2006, 1:48:48 PM (20 years ago)

Author:

eugene

Message:

removing old versions, updating to new DVO APIs

Location:

trunk/Ohana/src/photdbc/src

Files:

• check_directory.c (deleted)
• check_permissions.c (deleted)
• find_regions.c (deleted)
• gcatalog.c (deleted)
• get_regions.c (deleted)
• image-db.c (deleted)
• load_catalogs.c (modified) (1 diff)
• name_region.c (deleted)
• photdbc.c (modified) (1 diff)
• time.c (deleted)
• wcatalog.c (deleted)

trunk/Ohana/src/photdbc/src/load_catalogs.c

@@ -13 +13 @@
   for (i = 0; i < Nregion; i++) {
     catalog[i].filename = region[i].filename;  /* don't free region before catalog! */
-    switch (lock_catalog (&catalog[i], LCK_SOFT)) {
-    case 0:
-      fprintf (stderr, "ERROR: can't lock file %s\n", catalog[i].filename);
-      exit (1);
-    case 1:
-      gcatalog (&catalog[i]); /* load from disk */
-      break;
-    case 2:
-      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog[i].filename);
-      catalog[i].Naverage = 0;
-      catalog[i].Nmeasure = 0;
-      break;
-    default:
-      fprintf (stderr, "weird lock_catalog exit state\n");
-      exit (1);
+    catalog[i].catmode  = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
+    catalog[i].filename = skylist[0].filename[i];
+    catalog[i].Nsecfilt = GetPhotcodeNsecfilt ();
+    catalog[i].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+    if (options.update) catalog[i].catflags = LOAD_AVES | LOAD_MEAS_META | LOAD_MISS | LOAD_SECF;
+
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog[i], skylist[0].regions[i], VERBOSE, "w")) {
+      fprintf (stderr, "ERROR: failure to open/create catalog file %s\n", catalog.filename);
+      exit (2);
+    }
+    if (!catalog[i].Nave_disk) {
+      dvo_catalog_unlock (&catalog[i]);
+      dvo_catalog_free (&catalog[i]);
+      continue;
     }
   }

trunk/Ohana/src/photdbc/src/photdbc.c

@@ -35 +35 @@
   get_mags (catalog);
 
-  unlock_catalog (catalog);
+  // XXX this is all messed up: are we working on more than one region or not??
+  for (i = 0; i < Nregion; i++) {
+    // XXX empty catalogs are already unlocked and freed 
+    dvo_catalog_unlock (&catalog[i]);
+    dvo_catalog_free (&catalog[i]);
+  }
 
+  // XXX?????
   sprintf (filename, "newdir/%s", argv[1]);
   catalog[0].filename = filename;
 
   check_directory (catalog[0].filename);
-  if (!lock_catalog (catalog, LCK_XCLD)) { 
+  if (!dvo_catalog_open (catalog, ...)) { 
     fprintf (stderr, "can't lock new catalog file %s\n", catalog[0].filename);
     exit (1);
   }
-  wcatalog (catalog);
+  dvo_catalog_save (catalog);
   exit (0);
 }