Changeset 8321

Timestamp:

05/14/08 16:59:50

Author:

robert

Message:

Moved the cache file writing into StreamObject? so that the cache file is only
created once data is being read.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp (modified) (7 diffs)

OpenSceneGraph/trunk/src/osgPlugins/curl/ReaderWriterCURL.cpp

@@ -19 +19 @@
-#include <iostream>
-#include <sstream>
+#include <fstream>
-
-#include <curl/curl.h>
@@ -27 +28 @@
-    public:
-    
-Pair
-
-Pair(std::ostream* stream1, std::ostream* stream2=0
+Object
+
+Object(std::ostream* stream1, const std::string& cacheFileName
-                _stream1(stream1),
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        };
-    
@@ -40 +67 @@
-        {
-            size_t realsize = size * nmemb;
-
-
-
-
+
+
+
-
-            return realsize;
@@ -69 +95 @@
-
-
-Pair
+Object
-        {
-            if(!proxyAddress.empty())
@@ -255 +281 @@
-                                osgDB::getServerAddress(fileName) + "/" + 
-                                osgDB::getServerFileName(fileName);
-
-
+
+
+
+
+
+
+
+
+
-            if (!cacheFilePath.empty() && osgDB::fileExists(cacheFileName))
-            {
@@ -286 +319 @@
-        
-            std::stringstream buffer;
-
-
-
+
+
+
+
-            //ReadResult result = _easyCurl.read(proxyAddress, fileName, sp);
-
-
-
-
+
+
+
+
+
-                osg::ref_ptr<Options> local_opt = const_cast<Options*>(options);
-                if (!local_opt) local_opt = new Options;
@@ -303 +338 @@
-                local_opt->getDatabasePathList().pop_front();
-
-                if (!cacheFilePath.empty() && readResult.validObject())
-                {
-                    osg::notify(osg::INFO)<<"Writing cache file "<<cacheFileName<<std::endl;
-                    
-                    std::string filePath = osgDB::getFilePath(cacheFileName);
-                    if (osgDB::fileExists(filePath) || osgDB::makeDirectory(filePath))
-                    {
-                        switch(objectType)
-                        {
-                        case(OBJECT): osgDB::writeObjectFile( *(readResult.getObject()), cacheFileName ); break;
-                        case(IMAGE): osgDB::writeImageFile( *(readResult.getImage()), cacheFileName ); break;
-                        case(HEIGHTFIELD): osgDB::writeHeightFieldFile( *(readResult.getHeightField()), cacheFileName ); break;
-                        case(NODE): osgDB::writeNodeFile( *(readResult.getNode()), cacheFileName ); break;
-                        default: break;
-                        }
-                    }
-                    else
-                    {
-                        osg::notify(osg::NOTICE)<<"Error: Failed to created directory "<<filePath<<std::endl;
-                    }
-
-                }
-
-                return readResult;
-            }
-            else
-            {
-r
+curlR
-            }
-        }