Changeset 11292 for trunk/psModules/src/config

Timestamp:

Jan 25, 2007, 2:05:18 PM (19 years ago)

Author:

jhoblitt

Message:

add first pass nebclient support/linking
change pmConfigConvertFilename() to accept a boolean create [file] parameter

Location:

trunk/psModules/src/config

Files:

• pmConfig.c (modified) (5 diffs)
• pmConfig.h (modified) (2 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-23 03:19:35 $
+ *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 #include <glob.h>
 #include <pslib.h>
+
 #include "pmConfig.h"
+#include "pmErrorCodes.h"
 #include "pmConfigRecipes.h"
 #include "pmConfigCamera.h"
+
+#ifdef HAVE_NEBCLIENT
+#include <nebclient.h>
+#endif // ifdef HAVE_NEBCLIENT
 
 #define PS_SITE "PS_SITE"         // Name of the environment variable containing the site config file
@@ -1047 +1053 @@
 
 // convert the supplied name, create a new output psString
-psString pmConfigConvertFilename(const char *filename, const pmConfig *config)
+psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create)
 {
     PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
     PS_ASSERT_PTR_NON_NULL(config, NULL);
 
-    psString newName = psStringCopy (filename);
-
     // strip file:// from front of name
-    if (!strncasecmp (newName, "file:", strlen("file:"))) {
+    if (!strncasecmp(filename, "file:", strlen("file:"))) {
+        psString newName = psStringCopy(filename);
+
         char *point = newName + strlen("file:");
         while (*point == '/')
@@ -1063 +1069 @@
         psFree (newName);
         newName = tmpName;
+
+        return newName;
     }
 
     // replace path://PATH with matched datapath
-    if (!strncasecmp (newName, "path://", strlen("path://"))) {
+    if (!strncasecmp(filename, "path://", strlen("path://"))) {
         PS_ASSERT_METADATA_NON_NULL(config->site, NULL);
+
+        psString newName = psStringCopy(filename);
 
         // filename should be of the form: path://PATH/rest/of/file
@@ -1102 +1112 @@
         psFree(newName);
         newName = tmpName;
+
+        return newName;
     }
 
     // substitute neb://name with matched nebulous name
-
-    return newName;
-}
+    if (!strncasecmp(filename, "neb://", strlen("neb://"))) {
+        #ifdef HAVE_NEBCLIENT
+
+        bool status = false;
+        psString nebulous_server = psMetadataLookupStr(&status, config->site, "NEBULOUS_SERVER");
+        if (!status) {
+            psError(PM_ERR_CONFIG, true, "failed to lookup config value for NEBULOUS_SERVER.");
+            return NULL;
+        }
+        if (!nebulous_server) {
+            psError(PM_ERR_CONFIG, true, "Could not determine nebulous server URI.");
+            return NULL;
+        }
+
+        nebServer *server = nebServerAlloc(nebulous_server);
+        if (!server) {
+            psError(PM_ERR_SYS, true, "failed to create a nebServer object.");
+            nebServerFree(server);
+            return NULL;
+        }
+
+        psString newName = psStringCopy(filename);
+
+        // for for the nebulous key
+        char *foo = nebFind(server, newName);
+        // if it doesn't exist, create it
+        if (!foo) {
+            foo = nebCreate(server, newName, 0, NULL, NULL, NULL);
+        }
+
+        psFree(newName);
+        psString newFoo = psStringCopy(foo);
+        psFree(foo);
+        nebServerFree(server);
+
+        return newFoo;
+
+        #else // ifdef HAVE_NEBCLIENT
+
+        psError(PM_ERR_PROG, true, "psModules was compiled without nebulous support.");
+        return NULL;
+        #endif // ifdef HAVE_NEBCLIENT
+
+    }
+
+    // if we go this far, do nothing
+    return psStringCopy(filename);
+}

trunk/psModules/src/config/pmConfig.h

@@ -5 +5 @@
  *  @author Eugene Magnier, IfA
  * 
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-24 01:05:41 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-26 00:05:18 $
  *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -155 +155 @@
 
 /// Convert the supplied name, create a new output psString
-psString pmConfigConvertFilename(const char *filename, const pmConfig *config);
+psString pmConfigConvertFilename(
+    const char *filename,               ///< file path/URI
+    const pmConfig *config,             ///< configuration
+    bool create                         ///< create the file if it doesn't exist
+);
 
 /// Set whether all config parameters are read on startup