Changeset 11

Timestamp:

04/23/08 13:20:39

Author:

robert

Message:

Introduced support for parsing ${env_var} as part of path setup.

Files:

• trunk/src/ReadShowFile.cpp (modified) (2 diffs)
• trunk/src/ReadShowFile.h (modified) (1 diff)
• trunk/src/ReaderWriterXML.cpp (modified) (6 diffs)
• trunk/src/present3D.cpp (modified) (2 diffs)

trunk/src/ReadShowFile.cpp

@@ -21 +21 @@
-#include <osgDB/ReadFile>
-#include <osgDB/FileNameUtils>
+#include <osgDB/FileUtils>
+
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
-
-bool p3d::getFileNames(osg::ArgumentParser& arguments, FileNameList& xmlFiles, FileNameList& normalFiles)
@@ -42 +46 @@
-    return (!xmlFiles.empty() || !normalFiles.empty());
-}   
+
+bool p3d::readEnvVars(osg::ArgumentParser& arguments)
+{
+    bool readVars = false;
+
+    for(unsigned int i=1; i<arguments.argc(); ++i)
+    {
+        if (!arguments.isOption(i))
+        {
+            std::string ext = osgDB::getLowerCaseFileExtension(arguments[i]);
+            if (ext=="xml" || ext=="p3d")
+            {
+                std::string file = osgDB::findDataFile(arguments[i]);
+                if (!file.empty())
+                {
+                    if (p3d::readEnvVars(file)) readVars = true;
+                }
+            }
+        }
+    }
+    
+    return readVars;
+}
+
+bool p3d::readEnvVars(const std::string& fileName)
+{
+    std::string ext = osgDB::getFileExtension(fileName);
+    if (!osgDB::equalCaseInsensitive(ext,"xml") && 
+        !osgDB::equalCaseInsensitive(ext,"p3d")) return false;
+        
+        
+    xmlDocPtr doc;
+    xmlNodePtr cur;
+
+    doc = xmlParseFile(fileName.c_str());
+
+    if (doc == NULL )
+    {
+            fprintf(stderr,"Document not parsed successfully. \n");
+            return false;
+    }
+
+     cur = xmlDocGetRootElement(doc);
+
+     if (cur == NULL)
+     {
+            fprintf(stderr,"empty document\n");
+            xmlFreeDoc(doc);
+            return false;
+    }
+
+     if (xmlStrcmp(cur->name, (const xmlChar *) "presentation"))
+     {
+            fprintf(stderr,"document of the wrong type, root node != presentation");
+            xmlFreeDoc(doc);
+            return false;
+    }
+    
+    bool readVars = false;
+    
+    xmlChar *key;
+    cur = cur->xmlChildrenNode;
+    while (cur != NULL) {
+
+        if ((!xmlStrcmp(cur->name, (const xmlChar *)"env")))
+        {
+            key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+            if (key)
+            {
+                char* str = strdup((char*)key);
+                osg::notify(osg::INFO)<<"putenv("<<str<<")"<<std::endl;
+                putenv(str);
+                readVars = true;
+            }
+            xmlFree(key);
+        }
+        cur = cur->next;
+    }
+
+    xmlFreeDoc(doc);
+    
+    return readVars;
+}
-
-osg::Node* p3d::readHoldingSlide(const std::string& filename)

trunk/src/ReadShowFile.h

@@ -23 +23 @@
-bool getFileNames(osg::ArgumentParser& arguments, FileNameList& xmlFiles, FileNameList& normalFiles);
-
+bool readEnvVars(osg::ArgumentParser& arguments);
+
+bool readEnvVars(const std::string& filename);
+
-osg::Node* readHoldingSlide(const std::string& filename);
-

trunk/src/ReaderWriterXML.cpp

@@ -180 +180 @@
-    typedef std::map<std::string, unsigned int> StringKeyMap;
-
+    std::string expandEnvVarsInFileName(const std::string& filename) const; 
+
+
-    ColorMap            _colorMap;
-    LayoutMap           _layoutMap;
@@ -196 +199 @@
-// Register with Registry to instantiate the above reader/writer.
-osgDB::RegisterReaderWriterProxy<ReaderWriterP3DXML> g_readerWriter_P3DXML_Proxy;
+
+std::string ReaderWriterP3DXML::expandEnvVarsInFileName(const std::string& filename) const
+{
+    std::string argument(filename);
+    std::string::size_type start_pos = argument.find("${");
+    
+    while (start_pos != std::string::npos)
+    {        
+        std::string::size_type end_pos = argument.find("}",start_pos);
+        if (start_pos != std::string::npos)
+        {
+            std::string var = argument.substr(start_pos+2, end_pos-start_pos-2);
+            const char* str = getenv(var.c_str());
+
+            std::cout<<"for argument = ["<<argument<<"]"<<std::endl;
+
+            std::cout<<"Found ["<<var<<"] = "<<str<<std::endl;
+            argument.erase(start_pos, end_pos-start_pos+1);
+            argument.insert(start_pos, str);
+
+            std::cout<<"new argument = ["<<argument<<"]"<<std::endl;
+
+            start_pos = argument.find("${",start_pos+strlen(str));
+        }
+        else
+        {
+            start_pos = std::string::npos;
+        }
+        
+    }
+    
+    return argument;
+}
-
-bool ReaderWriterP3DXML::read(const char* str, float& value) const
@@ -539 +575 @@
-        value.absolute_path = false;
-        value.inverse_path = false;
-str
+expandEnvVarsInFileName(str)
-
-        osg::notify(_notifyLevel)<<"path read "<<str<<std::endl;
@@ -549 +585 @@
-        value.absolute_path = true;
-        value.inverse_path = true;
-str
+expandEnvVarsInFileName(str)
-
-        osg::notify(_notifyLevel)<<"camera path read "<<str<<std::endl;
@@ -1244 +1280 @@
-    while (cur != NULL) {
-
+/*
+        if ((!xmlStrcmp(cur->name, (const xmlChar *)"env")))
+        {
+            key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+            if (key)
+            {
+                osg::notify(osg::NOTICE)<<"putenv("<<(char*)key<<")"<<std::endl;
+                putenv((char*)key);
+            }
+            xmlFree(key);
+        }
+*/
-        if ((!xmlStrcmp(cur->name, (const xmlChar *)"name")))
-        {
@@ -1263 +1311 @@
-            {
-                osg::notify(osg::INFO)<<"Appending search path "<<(char*)key<<std::endl;
-std::string((char*)key
+expandEnvVarsInFileName(std::string((char*)key)
-            }
-            xmlFree(key);

trunk/src/present3D.cpp

@@ -166 +166 @@
-int main( int argc, char **argv )
-{
-
-    // use an ArgumentParser object to manage the program arguments.
-    osg::ArgumentParser arguments(&argc,argv);
@@ -199 +198 @@
-    }
-
+
+    // read any env vars from presentations before we create viewer to make sure the viewer
+    // utilises these env vars
+    if (p3d::readEnvVars(arguments))
+    {
+        osg::DisplaySettings::instance()->readEnvironmentalVariables();
+    }
+
+
-#ifdef USE_SDL
-    SDLIntegration sdlIntegration;