From c26b41d1255dcd9f50d70faedf2828d109246708 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 21 Mar 2008 13:20:07 +0000
Subject: [PATCH] Added better detection and error reporting of files without
 proper server address

---
 src/osgPlugins/curl/ReaderWriterCURL.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
index abe068999..73d28d39e 100644
--- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
+++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
@@ -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;
             }
         }