Changeset 9884

Timestamp:

03/10/09 13:21:13 (4 years ago)

Author:

robert

Message:

From Stephan Huber,
"Attached you'll find a proposal for using different
protocols. The idea behind the new code is:

1.) plugins/apps register protocols which they can handle. This is done
via osgDB::Registry::registerProtocol(aProtocolName). Plugins register
supported protocols as usual via ReaderWriter::supportsProtocol(..), the
Registry is updated accordingly.

2.) osgDB::containsServerAddress checks first for an appearance of "://"
in the filename and then checks the protocol against the set of
registered protocols via Registry::isProtocolRegistered(aProtocollName)

3.) the other getServer*-functions changed as well, there's even a
getServerProtocol-function

With these changes filenames/Urls get routed to loaded plugins even with
different protocols than 'http'."

Location:

OpenSceneGraph/trunk

Files:

• include/osgDB/FileNameUtils (modified) (1 diff)
• include/osgDB/Registry (modified) (3 diffs)
• src/osgDB/FileNameUtils.cpp (modified) (2 diffs)
• src/osgDB/ReaderWriter.cpp (modified) (1 diff)
• src/osgDB/Registry.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgDB/FileNameUtils

@@ -41 +41 @@
 
 extern OSGDB_EXPORT bool containsServerAddress(const std::string& filename);
+extern OSGDB_EXPORT std::string getServerProtocol(const std::string& filename);
 extern OSGDB_EXPORT std::string getServerAddress(const std::string& filename);
 extern OSGDB_EXPORT std::string getServerFileName(const std::string& filename);

OpenSceneGraph/trunk/include/osgDB/Registry

@@ -479 +479 @@
         /** Add an Archive extension.*/
         void addArchiveExtension(const std::string ext);
-
+        
+        /** registers a protocol */
+        void registerProtocol(const std::string& protocol);
+        
+        /** returns true, if named protocol is registered */
+        bool isProtocolRegistered(const std::string& protocol);
+        
     protected:
 
@@ -492 +498 @@
         typedef std::map<std::string, ObjectTimeStampPair >             ObjectCache;
         typedef std::map<std::string, osg::ref_ptr<osgDB::Archive> >    ArchiveCache;
+        
+        typedef std::set<std::string>                                   RegisteredProtocolsSet;
 
         /** constructor is private, as its a singleton, preventing
@@ -509 +517 @@
         
         bool                                        _createNodeFromImage;
+        
+        RegisteredProtocolsSet                      _registeredProtocols;
 
         osg::Object*       readObject(DotOsgWrapperMap& dowMap,Input& fr);

OpenSceneGraph/trunk/src/osgDB/FileNameUtils.cpp

@@ -180 +180 @@
 }
 
+
+
 bool osgDB::containsServerAddress(const std::string& filename)
 {
-    // need to check for http://
-    if (filename.size()<7) return false;
-    if (filename.compare(0,7,"http://")==0) return true;
-    return false;
+    // need to check for ://
+    std::string::size_type pos(filename.find_first_of("://"));
+    if (pos == std::string::npos) 
+        return false;
+    std::string proto(filename.substr(0, pos));
+    
+    return Registry::instance()->isProtocolRegistered(proto);
+}
+
+std::string osgDB::getServerProtocol(const std::string& filename)
+{
+    std::string::size_type pos(filename.find_first_of("://"));
+    if (pos != std::string::npos)
+        return filename.substr(0,pos);
+
+    return "";
 }
 
 std::string osgDB::getServerAddress(const std::string& filename)
 {
-    if (filename.size()>=7 && filename.compare(0,7,"http://")==0)
-    {
-        std::string::size_type pos_slash = filename.find_first_of('/',7);
+    std::string::size_type pos(filename.find_first_of("://"));
+    
+    if (pos != std::string::npos)
+    {
+        std::string::size_type pos_slash = filename.find_first_of('/',pos+3);
         if (pos_slash!=std::string::npos)
         {
-            return filename.substr(7,pos_slash-7);
+            return filename.substr(pos+3,pos_slash-pos-3);
         }
         else
         {
-            return filename.substr(7,std::string::npos);
+            return filename.substr(pos+3,std::string::npos);
         }
     }
@@ -207 +223 @@
 std::string osgDB::getServerFileName(const std::string& filename)
 {
-    if (filename.size()>=7 && filename.compare(0,7,"http://")==0)
-    {
-        std::string::size_type pos_slash = filename.find_first_of('/',7);
+    std::string::size_type pos(filename.find_first_of("://"));
+
+    if (pos != std::string::npos)
+    {
+        std::string::size_type pos_slash = filename.find_first_of('/',pos+3);
         if (pos_slash!=std::string::npos)
         {

OpenSceneGraph/trunk/src/osgDB/ReaderWriter.cpp

@@ -48 +48 @@
 void ReaderWriter::supportsProtocol(const std::string& fmt, const std::string& description)
 {
+    Registry::instance()->registerProtocol(fmt);
     _supportedProtocols[convertToLowerCase(fmt)] = description;
 }

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -331 +331 @@
     addFileExtensionAlias("pgm", "pnm");
     addFileExtensionAlias("ppm", "pnm");
+    
+    // register http-protocol, so the curl can handle it, if necessary
+    registerProtocol("http"); 
     
 }
@@ -2093 +2096 @@
     return _sharedStateManager.get();
 }
+
+
+void Registry::registerProtocol(const std::string& protocol) 
+{  
+    _registeredProtocols.insert( convertToLowerCase(protocol) ); 
+}
+        
+bool Registry::isProtocolRegistered(const std::string& protocol) 
+{ 
+    return (_registeredProtocols.find( convertToLowerCase(protocol) ) != _registeredProtocols.end()); 
+}
+