Changeset 26879 for branches/eam_branches/20091201/psModules/src/config/pmConfig.c

Timestamp:

Feb 10, 2010, 4:24:46 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20091201/psModules/src/config/pmConfig.c (modified) (3 diffs)

branches/eam_branches/20091201/psModules/src/config/pmConfig.c

@@ -47 +47 @@
 
 static bool checkPath(const char *filename, bool create, bool trunc);
+static psString resolveConfigFile(const char *name);
 
 bool pmConfigReadParamsSet(bool newReadCameraConfig)
@@ -447 +448 @@
             psWarning("-ipprc command-line switch provided without the required filename --- ignored.\n");
         } else {
-            configFile = psStringCopy(argv[argNum]);
+            configFile = resolveConfigFile(argv[argNum]);
             psArgumentRemove(argNum, argc, argv);
         }
@@ -1834 +1835 @@
     return false;
 }
+
+static psString resolveConfigFile(const char *nameArg)
+{
+    // if config file name is nebulous path resolve it
+    // otherwise just return a copy of the argument
+    if (strncasecmp(nameArg, "neb://", strlen("neb://"))) {
+        return psStringCopy(nameArg);
+    }
+
+#ifdef HAVE_NEBCLIENT
+    char *neb_server = getenv("NEB_SERVER");
+
+    // if env isn't set, check the config system
+    if (!neb_server) {
+        psError(PM_ERR_CONFIG, true, "NEB_SERVER environment variable must be set in order to resolve config file.");
+            return NULL;
+    }
+
+    nebServer *server = nebServerAlloc(neb_server);
+    if (!server) {
+        psError(PM_ERR_SYS, true, "failed to create a nebServer object.");
+        return NULL;
+    }
+
+    char *nebfile = nebFind(server, nameArg);
+    nebServerFree(server);
+    if (!nebfile) {
+        // object does not exist
+        psError(PM_ERR_SYS, true, "failed to resolve nebulous path: %s.", nameArg);
+        return NULL;
+    }
+    // XXX: do I need to free nebfile?
+
+    return psStringCopy(nebfile);
+#else
+    psError(PM_ERR_PROG, true, "psModules was compiled without nebulous support.");
+    return NULL;
+#endif // ifdef HAVE_NEBCLIENT
+}