Changeset 37453 for branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/ConfigInit.c

Timestamp:

Oct 2, 2014, 11:03:19 AM (12 years ago)

Author:

eugene

Message:

first working example of fakeastro

File:

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

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/ConfigInit.c

@@ -5 +5 @@
   char  *config, *file;
   char CatdirPhotcodeFile[256];
-  struct stat filestat;
-  int status;
 
   /*** load configuration info ***/
@@ -30 +28 @@
   ScanConfig(config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig(config, "CATFORMAT",              "%s",  0, CATFORMAT);
+  GetConfig (config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
 
   sprintf (ImageCat, "%s/Images.dat", CATDIR);
@@ -39 +38 @@
   if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
 
-  // check for existence of CATDIR
-  status = stat (CATDIR, &filestat);
-  if (status == -1) {
-    fprintf (stderr, "directory %s does not exist, giving up\n", CATDIR);
-    exit (1);
-  }
-
   /* update master photcode table if not defined */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);