Changeset 20982

Timestamp:

Dec 14, 2008, 11:50:31 AM (17 years ago)

Author:

eugene

Message:

if OBJID or CATID are missing, just give a warning

Location:

trunk/Ohana/src/libdvo/src

Files:

• dvo_catalog_mef.c (modified) (1 diff)
• dvo_catalog_raw.c (modified) (1 diff)
• dvo_catalog_split.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

@@ -30 +30 @@
   /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
      it is not defined for a legacy database, we can generate them using the existing index values.
-     XXX if it is missing, give an error and require the user to upgrade the DB? */
-  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) return (FALSE);
-  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) return (FALSE);
-
+     If it is missing, give a warning and recommend the user upgrade the DB */
+  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for %s: upgrade for full feature set\n", catalog[0].filename);
+    catalog[0].objID = 0;
+  }
+  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for %s: upgrade for full feature set\n", catalog[0].filename);
+    catalog[0].catID = 0;
+  }
+  
   /* save the current number so we can do partial updates */
   catalog[0].Naves_disk = Naverage;

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

@@ -28 +28 @@
   /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
      it is not defined for a legacy database, we can generate them using the existing index values.
-     XXX if it is missing, give an error and require the user to upgrade the DB? */
-  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) return (FALSE);
-  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) return (FALSE);
+     If it is missing, give a warning and recommend the user upgrade the DB */
+  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for this database: upgrade for full feature set\n");
+    catalog[0].objID = 0;
+  }
+  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for this database: upgrade for full feature set\n");
+    catalog[0].catID = 0;
+  }
 
   /* determine catalog format */

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

@@ -177 +177 @@
   /* the OBJID is a counter that uniquely defines an average entry and never changes.  if
      it is not defined for a legacy database, we can generate them using the existing index values.
-     XXX if it is missing, give an error and require the user to upgrade the DB? */
-  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) return (FALSE);
-  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) return (FALSE);
+     If it is missing, give a warning and recommend the user upgrade the DB */
+  if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for this database: upgrade for full feature set\n");
+    catalog[0].objID = 0;
+  }
+  if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
+    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for this database: upgrade for full feature set\n");
+    catalog[0].catID = 0;
+  }
 
   /* save the current number so we can do partial updates */