FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added better detection and error reporting of files without proper server address

Browse Source
This commit is contained in:
Robert Osfield
2008-03-21 13:20:07 +00:00
parent ac63d37f7b
commit c26b41d125
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/curl/ReaderWriterCURL.cpp
View File

@@ -110,8 +110,13 @@ class ReaderWriterCURL : public osgDB::ReaderWriter
virtual ReadResult readFile(ObjectType objectType, const std::string& fullFileName, const Options *options) const
{
if (!osgDB::containsServerAddress(fullFileName))
{
osg::notify(osg::NOTICE)<<"File '"<<fullFileName<<"' does not contain server address, cannort load with libcurl plugin."<<std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
std::string fileName;
std::string ext = osgDB::getFileExtension(fullFileName);
if (ext=="curl")
{
@@ -121,7 +126,7 @@ class ReaderWriterCURL : public osgDB::ReaderWriter
{
fileName = fullFileName;
}
osgDB::ReaderWriter *reader =
osgDB::Registry::instance()->getReaderWriterForExtension( osgDB::getFileExtension(fileName));
@@ -159,7 +164,7 @@ class ReaderWriterCURL : public osgDB::ReaderWriter
}
else
{
osg::notify(osg::NOTICE)<<"Read error res = "<<res<<std::endl;
osg::notify(osg::NOTICE)<<"Read error, file="<<fileName<<" libcurl result = "<<res<<std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
}