Changeset 12332 for trunk/Ohana/src/imregister/base/ConfigInit.c

Timestamp:

Mar 8, 2007, 12:21:18 PM (19 years ago)

Author:

eugene

Message:

complete merge from branch dvo-mods-2007-02

File:

• trunk/Ohana/src/imregister/base/ConfigInit.c (modified) (4 diffs)

trunk/Ohana/src/imregister/base/ConfigInit.c

@@ -7 +7 @@
   int i, NDB;
   char *config, *file, ElixirBase[80], catdir[256];
+  char CatdirPhotcodeFile[256];
+  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -25 +27 @@
 
   WarnConfig (config, "CATDIR",                      "%s", 0, catdir);
+  WarnConfig (config, "PHOTCODE_FILE",               "%s", 0, MasterPhotcodeFile);
   sprintf (ImPhotDB, "%s/Images.dat", catdir);
 
   /* small text databases: filters, camera defs */ 
-  WarnConfig (config, "PHOTCODE_FILE",               "%s", 0, PhotCodeFile);
   WarnConfig (config, "TEMPERATURE_LOG",             "%s", 0, TempLogFile);
   WarnConfig (config, "FILTER_LIST",                 "%s", 0, FilterList);
@@ -73 +75 @@
                                                    
   WarnConfig (config, "imstats",                     "%s", 0, ElixirBase);
-  sprintf (ImstatFifo, "%s.source", ElixirBase);   
+  sprintf (ImstatFifo, "%s.photcode", ElixirBase);   
   WarnConfig (config, "ptolemy",                     "%s", 0, ElixirBase);
-  sprintf (PtolemyFifo, "%s.source", ElixirBase);
+  sprintf (PtolemyFifo, "%s.photcode", ElixirBase);
 
   if (!ScanConfig (config, "CONNECT", "%s",  0, CONNECT)) {
@@ -101 +103 @@
   }
 
+  /* XXX this does not yet write out the master photcode table */
+  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", catdir);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
+    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+    exit (1);
+  }
+
   free (config);
   free (file);