Changeset 8427 for trunk/Ohana/src/opihi/dvo/mextract.c

Timestamp:

Aug 20, 2006, 5:36:41 PM (20 years ago)

Author:

eugene

Message:

updated to the new DVO APIs; minor cleanups (unused variables, etc)

File:

• trunk/Ohana/src/opihi/dvo/mextract.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -14 +14 @@
 
   /* defaults */
-  catalog.average = (Average *) NULL; 
-  catalog.secfilt = (SecFilt *) NULL;
-  catalog.measure = (Measure *) NULL;
+  skylist = NULL;
   RegionName = NULL;
   RegionList = NULL;
   code = NULL;
   mode = MAG_REL;
+  dvo_catalog_init (&catalog, TRUE);
 
   /* load photcode information */
@@ -57 +56 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
     catalog.filename = skylist[0].filename[i];
-    switch (lock_catalog (&catalog, LCK_SOFT)) {
-      case 2:
-        unlock_catalog (&catalog);
-      case 0:
-        continue;
+    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
+      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      exit (2);
     }
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
-    if (!load_catalog (&catalog, FALSE)) {
-      unlock_catalog (&catalog);
-      continue;
-    }
-    unlock_catalog (&catalog);
+    dvo_catalog_unlock (&catalog);
 
     for (j = 0; j < catalog.Naverage; j++) {
@@ -81 +76 @@
       if (M1 != NULL) free (M1);
     }
-    if (catalog.average != NULL) free (catalog.average);
-    if (catalog.secfilt != NULL) free (catalog.secfilt);
-    if (catalog.measure != NULL) free (catalog.measure);
-    catalog.average = (Average *) NULL; 
-    catalog.secfilt = (SecFilt *) NULL;
-    catalog.measure = (Measure *) NULL;
+    dvo_catalog_free (&catalog);
   }
   vec[0].Nelements = N;
@@ -105 +95 @@
   FreeImageSelection ();
   SkyListFree (skylist, ((RegionName != NULL) || (RegionList != NULL)));
-  if (catalog.average != NULL) free (catalog.average);
-  if (catalog.secfilt != NULL) free (catalog.secfilt);
-  if (catalog.measure != NULL) free (catalog.measure);
+  dvo_catalog_free (&catalog);
   if (RegionName != NULL) free (RegionName);
   if (RegionList != NULL) free (RegionList);