Changeset 34689 for branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c

Timestamp:

Nov 23, 2012, 8:50:17 PM (14 years ago)

Author:

eugene

Message:

do not create an empty, default database if CATDIR is not found

File:

• branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c (modified) (3 diffs)

branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c

@@ -6 +6 @@
   char  *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -45 +44 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
 
-  sprintf (ImageCat, "%s/Images.dat", CATDIR);
+  sprintf (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
 
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
@@ -69 +67 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }