diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-14 13:20:04 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-12-14 13:20:04 (GMT) |
commit | 330576fcb4d97504e0d6951067b753499d91b541 (patch) | |
tree | 9c583dd3e13ff574295f559a7b92dfe9a1dafd2d /src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp | |
parent | 9608216597fd17021d38e80689644beb3c85abb9 (diff) | |
download | uscxml-330576fcb4d97504e0d6951067b753499d91b541.zip uscxml-330576fcb4d97504e0d6951067b753499d91b541.tar.gz uscxml-330576fcb4d97504e0d6951067b753499d91b541.tar.bz2 |
Renamed URI to URL
Some fixes for Xincludes
Diffstat (limited to 'src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp')
-rw-r--r-- | src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index 84e5520..79b1829 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -74,7 +74,7 @@ void USCXMLInvoker::cancel(const std::string sendId) { void USCXMLInvoker::invoke(const InvokeRequest& req) { _cancelled = false; if (req.src.length() > 0) { - _invokedInterpreter = Interpreter::fromURI(req.src); + _invokedInterpreter = Interpreter::fromURL(req.src); } else if (req.dom) { Arabica::DOM::DOMImplementation<std::string> domFactory = Arabica::SimpleDOM::DOMImplementation<std::string>::getDOMImplementation(); Arabica::DOM::Document<std::string> dom = domFactory.createDocument(req.dom.getNamespaceURI(), "", 0); @@ -82,9 +82,9 @@ void USCXMLInvoker::invoke(const InvokeRequest& req) { Arabica::DOM::Node<std::string> newNode = dom.importNode(req.dom, true); dom.appendChild(newNode); // TODO: where do we get the namespace from? - _invokedInterpreter = Interpreter::fromDOM(dom, _interpreter->getNameSpaceInfo(), _interpreter->getSourceURI()); + _invokedInterpreter = Interpreter::fromDOM(dom, _interpreter->getNameSpaceInfo(), _interpreter->getSourceURL()); } else if (req.content.size() > 0) { - _invokedInterpreter = Interpreter::fromXML(req.content, _interpreter->getSourceURI()); + _invokedInterpreter = Interpreter::fromXML(req.content, _interpreter->getSourceURL()); } else { LOG(ERROR) << "Cannot invoke nested SCXML interpreter, neither src attribute nor content nor DOM is given"; } |