Changeset 6684 for trunk/Ohana/src/opihi/dvo/region_list.c

Timestamp:

Mar 26, 2006, 1:14:47 PM (20 years ago)

Author:

eugene

Message:

removed IMAGE_CATALOG from config, finished proper-motion additions, minor fixes in graphing

File:

• trunk/Ohana/src/opihi/dvo/region_list.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/region_list.c

@@ -11 +11 @@
 
   char *newpath;
-  char catdir[256];
+  char catdir_config[256];
   char gscfile[256];
   char skyfile[256];
@@ -18 +18 @@
   /* find CATDIR in config system */
   if (path == NULL) {
-    if (VarConfig ("CATDIR", "%s", catdir) == NULL) return (FALSE);
-    newpath = catdir;
+    if (VarConfig ("CATDIR", "%s", catdir_config) == NULL) return (FALSE);
+    newpath = catdir_config;
   } else {
     newpath = path;
@@ -32 +32 @@
 
   if (verbose) {
-      fprintf (stderr, "CATDIR %s\n", catdir);
+      fprintf (stderr, "CATDIR %s\n", CATDIR);
       fprintf (stderr, "GSCFILE %s\n", gscfile);
       fprintf (stderr, "SKYFILE %s\n", skyfile);
@@ -42 +42 @@
 
   if (sky != NULL) SkyTableFree (sky);
-  sky = SkyTableLoadOptimal (catdir, skyfile, gscfile, skydepth, verbose);
+  sky = SkyTableLoadOptimal (CATDIR, skyfile, gscfile, skydepth, verbose);
   if (sky == NULL) return FALSE;
 
-  SkyTableSetFilenames (sky, catdir, "cpt");
+  SkyTableSetFilenames (sky, CATDIR, "cpt");
 
   return (TRUE);
+}
+
+char *GetCATDIR () {
+  if (CATDIR == NULL) {
+    SetCATDIR (NULL, FALSE);
+  }
+  return (CATDIR);
 }