diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-14 21:22:24 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-04-14 21:22:24 (GMT) |
commit | 1c10bc4bf19c5ce73e3e10380e613da8bf93a1b0 (patch) | |
tree | d2f89e5c4564ef7e363f17eaee3800650a5ab4bd /src/uscxml/plugins | |
parent | 631b88e42c3fb7e10dee390d170854e40c31fac0 (diff) | |
download | uscxml-1c10bc4bf19c5ce73e3e10380e613da8bf93a1b0.zip uscxml-1c10bc4bf19c5ce73e3e10380e613da8bf93a1b0.tar.gz uscxml-1c10bc4bf19c5ce73e3e10380e613da8bf93a1b0.tar.bz2 |
Refactored URLs and fixed Windows URL handling
Diffstat (limited to 'src/uscxml/plugins')
-rw-r--r-- | src/uscxml/plugins/element/fetch/FetchElement.cpp | 2 | ||||
-rw-r--r-- | src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/plugins/element/fetch/FetchElement.cpp b/src/uscxml/plugins/element/fetch/FetchElement.cpp index 56c1815..e6ceb3f 100644 --- a/src/uscxml/plugins/element/fetch/FetchElement.cpp +++ b/src/uscxml/plugins/element/fetch/FetchElement.cpp @@ -90,7 +90,7 @@ void FetchElement::enterElement(const Arabica::DOM::Node<std::string>& node) { _targetUrl = URL(_target); if (!_targetUrl.isAbsolute()) { - if (!_interpreter->toAbsoluteURI(_targetUrl)) { + if (!_targetUrl.toAbsolute(_interpreter->getBaseURI())) { LOG(ERROR) << "Cannot transform " << _target << " into absolute URL"; return; } diff --git a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp index 882c174..8e3209a 100644 --- a/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp +++ b/src/uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.cpp @@ -90,7 +90,7 @@ void DirMonInvoker::invoke(const InvokeRequest& req) { std::multimap<std::string, std::string>::const_iterator dirIter = req.params.find("dir"); while(dirIter != req.params.upper_bound("dir")) { URL url(dirIter->second); - if (!_interpreter->toAbsoluteURI(url) || !boost::iequals(url.scheme(), "file")) { + if (!url.toAbsolute(_interpreter->getBaseURI()) || !boost::iequals(url.scheme(), "file")) { LOG(ERROR) << "Given directory '" << dirIter->second << "' cannot be transformed to absolute path"; } else { _dir = url.path(); |