Changeset 8427 for trunk/Ohana/src/opihi/dvo/imdata.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/imdata.c (modified) (2 diffs)

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

@@ -121 +121 @@
     /* get file name and open */
     catalog.filename = skylist[0].filename[j];
-    switch (lock_catalog (&catalog, LCK_SOFT)) {
-      case 2:
-        unlock_catalog (&catalog);
-      case 0:
-        continue;
-    }
-    catalog.catflags = LOAD_AVES;
-    if (!load_catalog (&catalog, TRUE)) {
-      unlock_catalog (&catalog);
-      continue;
-    }
-    unlock_catalog (&catalog);
+    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);
+    }
+    dvo_catalog_unlock (&catalog);
 
     /* assign vector values */
@@ -203 +199 @@
         break;
     }
-    if (catalog.average != 0) {
-      free (catalog.average);
-    }
-    if (catalog.measure != 0) {
-      free (catalog.measure);
-    }
+    dvo_catalog_free (&catalog);
   }