Changeset 5229 for trunk/Ohana/src/addstar/src/image-db.c

Timestamp:

Oct 6, 2005, 6:11:02 AM (21 years ago)

Author:

eugene

Message:

added CLOSEST match method, added SPLIT table support, made catmode and catformat case-insensitive, added -nosort concept, cleaned find_matches

File:

• trunk/Ohana/src/addstar/src/image-db.c (modified) (2 diffs)

trunk/Ohana/src/addstar/src/image-db.c

@@ -40 +40 @@
 
   /* set the recommended mode */
-  if (!strcmp (CATMODE, "RAW")) {
+  db[0].mode = DVO_MODE_UNDEF;
+  if (!strcasecmp (CATMODE, "RAW")) {
     /* make header a fake image */
     db[0].header.bitpix   = 16;
@@ -49 +50 @@
     db[0].mode = DVO_MODE_RAW;
   }
-
-  if (!strcmp (CATMODE, "MEF") || !strcmp (CATMODE, "SPLIT")) {
+  if (!strcasecmp (CATMODE, "MEF") || !strcasecmp (CATMODE, "SPLIT")) {
     db[0].header.extend   = TRUE;
     fits_create_header (&db[0].header);
     db[0].mode = DVO_MODE_MEF;
   }
+  if (db[0].mode == DVO_MODE_UNDEF) {
+    fprintf (stderr, "invalid output catalog mode\n");
+    exit (1);
+  }
 
   /* set the recommended format */
   db[0].format = DVO_FORMAT_UNDEF;
-  if (!strcmp (CATFORMAT, "INTERNAL"))  db[0].format = DVO_FORMAT_INTERNAL;
-  if (!strcmp (CATFORMAT, "LONEOS"))    db[0].format = DVO_FORMAT_LONEOS;
-  if (!strcmp (CATFORMAT, "ELIXIR"))    db[0].format = DVO_FORMAT_ELIXIR;
-  if (!strcmp (CATFORMAT, "PANSTARRS")) db[0].format = DVO_FORMAT_PANSTARRS;
+  if (!strcasecmp (CATFORMAT, "INTERNAL"))  db[0].format = DVO_FORMAT_INTERNAL;
+  if (!strcasecmp (CATFORMAT, "LONEOS"))    db[0].format = DVO_FORMAT_LONEOS;
+  if (!strcasecmp (CATFORMAT, "ELIXIR"))    db[0].format = DVO_FORMAT_ELIXIR;
+  if (!strcasecmp (CATFORMAT, "PANSTARRS")) db[0].format = DVO_FORMAT_PANSTARRS;
   if (db[0].format == DVO_FORMAT_UNDEF) {
     fprintf (stderr, "invalid output catalog format\n");