Changeset 8342 for trunk/Ohana/src/libdvo/src/dvo_catalog_create.c

Timestamp:

Aug 14, 2006, 6:27:39 PM (20 years ago)

Author:

eugene

Message:

updates to the dvo image/catalog APIs

File:

• trunk/Ohana/src/libdvo/src/dvo_catalog_create.c (modified) (6 diffs)

trunk/Ohana/src/libdvo/src/dvo_catalog_create.c

@@ -1 @@
-# include <ohana.h>
 # include <dvo.h>
 # define DEBUG 1
 
 // create a new dvo catalog file (if split, lock extra files as well?)
-void dvo_catalog_create (SkyRegion *region, Catalog *catalog, int Nsecfilt, char *catformat, char *catmode) {
+// catalog internals which must be set:
+// catalog[0].filename
+// catalog[0].catmode
+// catalog[0].catformat (used by dvo_catalog_save)
+// catalog[0].lockmode
+void dvo_catalog_create (SkyRegion *region, Catalog *catalog, int Nsecfilt) {
 
-  int length, status;
+  int length;
   char *path, *root, *file, *line;
   time_t now;
@@ -12 +16 @@
   if (DEBUG) fprintf (stderr, "new catalog file: %s\n", catalog[0].filename);
 
-  dvo_catalog_init (catalog);
-
-  /* set the recommended CATFORMAT */
-  catalog[0].catformat = DVO_FORMAT_UNDEF;
-  if (!strcasecmp (catformat, "INTERNAL"))  catalog[0].catformat = DVO_FORMAT_INTERNAL;
-  if (!strcasecmp (catformat, "LONEOS"))    catalog[0].catformat = DVO_FORMAT_LONEOS;
-  if (!strcasecmp (catformat, "ELIXIR"))    catalog[0].catformat = DVO_FORMAT_ELIXIR;
-  if (!strcasecmp (catformat, "PANSTARRS")) catalog[0].catformat = DVO_FORMAT_PANSTARRS;
-  if (!strcasecmp (catformat, "PMTEST"))    catalog[0].catformat = DVO_FORMAT_PMTEST;
-  if (catalog[0].catformat == DVO_FORMAT_UNDEF) {
-    fprintf (stderr, "invalid output catalog format\n");
-    exit (1);
-  }
-
-  /* set the recommended CATMODE */
-  catalog[0].catmode = DVO_MODE_UNDEF;
-  if (!strcasecmp (catmode, "RAW"))   catalog[0].catmode = DVO_MODE_RAW;
-  if (!strcasecmp (catmode, "MEF"))   catalog[0].catmode = DVO_MODE_MEF;
-  if (!strcasecmp (catmode, "SPLIT")) catalog[0].catmode = DVO_MODE_SPLIT;
-  if (catalog[0].catmode == DVO_MODE_UNDEF) {
-    fprintf (stderr, "invalid output catalog mode\n");
-    exit (1);
-  }
+  // init the data values, not the internals listed above
+  dvo_catalog_init (catalog, FALSE);
 
   /* for RAW mode, make header a fake image */
@@ -52 +35 @@
     /* define measure catalog file */
     ALLOCATE (catalog[0].measure_catalog, Catalog, 1);
-    dvo_catalog_init (catalog[0].measure_catalog);
+    dvo_catalog_init (catalog[0].measure_catalog, TRUE);
 
     /* create basic data for measure catalog file */
@@ -64 +47 @@
     /* define missing catalog file */
     ALLOCATE (catalog[0].missing_catalog, Catalog, 1);
-    dvo_catalog_init (catalog[0].missing_catalog);
+    dvo_catalog_init (catalog[0].missing_catalog, TRUE);
 
     /* create basic data for missing catalog file */
@@ -76 +59 @@
     /* define secfilt catalog file */
     ALLOCATE (catalog[0].secfilt_catalog, Catalog, 1);
-    dvo_catalog_init (catalog[0].secfilt_catalog);
+    dvo_catalog_init (catalog[0].secfilt_catalog, TRUE);
 
     /* create basic data for secfilt catalog file */
@@ -90 +73 @@
     // lock the additional split files
     // XXX clear residual locks if we fail
-    if (lock_catalog (catalog[0].measure_catalog, catalog[0].lockmode) != 2) {
+    if (dvo_catalog_lock (catalog[0].measure_catalog, catalog[0].lockmode) != 2) {
       fprintf (stderr, "error with file lock\n");
       exit (2);
     }
-    if (lock_catalog (catalog[0].missing_catalog, catalog[0].lockmode) != 2) {
+    if (dvo_catalog_lock (catalog[0].missing_catalog, catalog[0].lockmode) != 2) {
       fprintf (stderr, "error with file lock\n");
       exit (2);
     }
-    if (lock_catalog (catalog[0].secfilt_catalog, catalog[0].lockmode) != 2) {
+    if (dvo_catalog_lock (catalog[0].secfilt_catalog, catalog[0].lockmode) != 2) {
       fprintf (stderr, "error with file lock\n");
       exit (2);