Changeset 8456

Timestamp:

Aug 21, 2006, 4:00:06 PM (20 years ago)

Author:

eugene

Message:

minor issues with new APIs

Location:

trunk/Ohana/src/libdvo/src

Files:

• dvo_catalog.c (modified) (7 diffs)
• dvo_catalog_raw.c (modified) (1 diff)
• dvo_catalog_split.c (modified) (7 diffs)
• dvo_convert.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -75 +75 @@
     catalog[0].catflags = 0;
     catalog[0].sorted = 0;
+    catalog[0].Nsecfilt = 0;
   }
 
@@ -88 +89 @@
   catalog[0].Nmeasure = 0;
   catalog[0].Nmissing = 0;
-  catalog[0].Nsecfilt = 0;
 
   catalog[0].Nave_disk  = 0;
@@ -173 +173 @@
   if (mode == DVO_OPEN_NONE) return (FALSE);
 
+  // save the expected Nsecfilt value for testing
+  Nsecfilt = catalog[0].Nsecfilt;
+
+  dvo_catalog_init (catalog, FALSE);
+
   catalog[0].lockmode  = LCK_XCLD;
   if (mode == DVO_OPEN_READ) catalog[0].lockmode  = LCK_SOFT;
-
+  
   // XXX make a backup?  always?
   if (!check_file_access (catalog[0].filename, TRUE, VERBOSE)) {
@@ -182 +187 @@
   }
 
-  if (VERBOSE) fprintf (stderr, "adding to %s\n", catalog[0].filename);
-    
-  // save the expected Nsecfilt value for testing
-  Nsecfilt = catalog[0].Nsecfilt;
-
+  if (VERBOSE) fprintf (stderr, "opening %s\n", catalog[0].filename);
+  
   switch (dvo_catalog_lock (catalog, catalog[0].lockmode)) {
   case 0:
@@ -203 +205 @@
     break;
   case 2:
-    if (DVO_OPEN_READ || DVO_OPEN_UPDATE) return (TRUE);
+    if ((mode == DVO_OPEN_READ) || (mode == DVO_OPEN_UPDATE)) return (TRUE);
+    catalog[0].Nsecfilt = Nsecfilt;
     dvo_catalog_create (region, catalog); /* fills in new header info */
     if (VERBOSE) fprintf (stderr, "creating new file %s\n", catalog[0].filename);
@@ -256 +259 @@
       if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_SPLIT)\n");
       dvo_catalog_load_split (catalog, VERBOSE);
-      dvo_catalog_test (catalog, TRUE);
       break;
     default:
@@ -326 +328 @@
   SecFilt *insec, *outsec;
 
+  if (Nsecfilt == 0) return (TRUE); // if Nsecfilt is not set, don't do this check
   if (catalog[0].Nsecfilt == Nsecfilt) return (TRUE);
   if (catalog[0].Nsecfilt > Nsecfilt) return (FALSE);

trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

@@ -35 +35 @@
     if (catalog[0].catformat != DVO_FORMAT_UNDEF) goto got_format;
   }
+  /* special cases: old versions of the DB tables which were poorly identified */
   if (gfits_scan (&catalog[0].header, "NEWMEAS",  "%t", 1, &NewMeasure)) {
     catalog[0].catformat = DVO_FORMAT_ELIXIR;

trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

@@ -3 +3 @@
 int dvo_catalog_load_split (Catalog *catalog, int VERBOSE) {
 
-  int Nitems, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt;
+  int Nitems, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt, status;
   char *path, string[80];
   Header header;
@@ -60 +60 @@
     gfits_free_header (&header);
   } 
-  dvo_catalog_test (catalog, FALSE);
 
   /*** Measure Table ***/
@@ -111 +110 @@
     gfits_free_matrix (&matrix);
   }
-  dvo_catalog_test (catalog, FALSE);
 
   /* (Meta Load) */
@@ -143 +141 @@
   }
   catalog[0].measure_catalog = measure;
-  dvo_catalog_test (catalog, FALSE);
 
   /*** Missing Table ***/
@@ -158 +155 @@
 
     /* lock & open catalog file */
-    if (dvo_catalog_lock (missing, catalog[0].lockmode) != 1) {
-      fprintf (stderr, "cannot access missing file %s\n", missing[0].filename);
+    status = dvo_catalog_lock (missing, catalog[0].lockmode);
+    if (!status) {
+      fprintf (stderr, "ERROR: cannot access missing file %s\n", missing[0].filename);
       exit (2);
+    }
+    if (status == 2) {
+        /* MISSING table is empty (this is not an error) */
+        gfits_create_header (&missing[0].header);
+        goto missing_empty;
     }
 
@@ -191 +194 @@
     gfits_free_matrix (&matrix);
   } 
+missing_empty:
   catalog[0].missing_catalog = missing;
-  dvo_catalog_test (catalog, FALSE);
 
   /*** Secfilt Table ***/
@@ -241 +244 @@
   } 
   catalog[0].secfilt_catalog = secfilt;
-  dvo_catalog_test (catalog, FALSE);
 
   /* save the current number so we can do partial updates */

trunk/Ohana/src/libdvo/src/dvo_convert.c

@@ -428 +428 @@
       return (TRUE);
     case DVO_FORMAT_PANSTARRS:
+    case DVO_FORMAT_PMTEST:
       /* convert table rows from internal to external format */
       for (i = 0; i < Nrow; i++) {