generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-15 19:33:07 +01:00
Code Issues Projects Releases Wiki Activity

improvement of URIStreamOpener::open() implementation

Browse Source
This commit is contained in:
Günter Obiltschnig 2016-09-29 19:06:46 +02:00 committed by Guenter Obiltschnig
parent e87a3a6e45
commit a73eef0487
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Foundation/src/URIStreamOpener.cpp
View File

@ -65,22 +65,15 @@ std::istream* URIStreamOpener::open(const std::string& pathOrURI) const
{
return openURI(scheme, uri);
}
else
else if (scheme.length() <= 1) // could be Windows path
{
Path path;
if (path.tryParse(pathOrURI, Path::PATH_GUESS))
{
return openFile(path);
else
throw UnknownURISchemeException(pathOrURI);
}
}
}
catch (UnknownURISchemeException&)
{
throw;
}
catch (TooManyURIRedirectsException&)
{
throw;
throw UnknownURISchemeException(pathOrURI);
}
catch (URISyntaxException&)
{
@ -105,24 +98,32 @@ std::istream* URIStreamOpener::open(const std::string& basePathOrURI, const std:
if (it != _map.end())
{
uri.resolve(pathOrURI);
scheme = uri.getScheme();
return openURI(scheme, uri);
}
else if (scheme.length() <= 1) // could be Windows path
{
Path base;
Path path;
if (base.tryParse(basePathOrURI, Path::PATH_GUESS) && path.tryParse(pathOrURI, Path::PATH_GUESS))
{
base.resolve(path);
return openFile(base);
}
}
throw UnknownURISchemeException(basePathOrURI);
}
catch (UnknownURISchemeException&)
{
throw;
}
catch (TooManyURIRedirectsException&)
{
throw;
}
catch (Exception&)
catch (URISyntaxException&)
{
Path base;
Path path;
if (base.tryParse(basePathOrURI, Path::PATH_GUESS) && path.tryParse(pathOrURI, Path::PATH_GUESS))
{
base.resolve(path);
return openFile(base);
}
else throw;
}
Path base(basePathOrURI, Path::PATH_GUESS);
Path path(pathOrURI, Path::PATH_GUESS);
base.resolve(path);
return openFile(base);
}