summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/invoker/xhtml
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-25 10:41:58 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-25 10:41:58 (GMT)
commit26183abd9acd44a0382e55cc985795ee7c526aed (patch)
treea9d9289397b65892dbad037d02460cf2d04597fb /src/uscxml/plugins/invoker/xhtml
parentbd45c688b3d3aad5d62b85457ce943eaadf989ae (diff)
downloaduscxml-26183abd9acd44a0382e55cc985795ee7c526aed.zip
uscxml-26183abd9acd44a0382e55cc985795ee7c526aed.tar.gz
uscxml-26183abd9acd44a0382e55cc985795ee7c526aed.tar.bz2
Updated W3C tests and bug-fixes
Diffstat (limited to 'src/uscxml/plugins/invoker/xhtml')
-rw-r--r--src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
index 059e7f5..acbf085 100644
--- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
@@ -88,7 +88,8 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
std::string content;
std::stringstream ss;
if (_invokeReq.dom) {
- ss << _invokeReq.getFirstDOMElement();
+// ss << _invokeReq.getFirstDOMElement();
+ ss << _invokeReq.dom;
content = ss.str();
} else if(_invokeReq.data) {
ss << _invokeReq.data;
@@ -160,14 +161,16 @@ void XHTMLInvoker::reply(const SendRequest& req, const HTTPServer::Request& long
if (req.dom) {
std::stringstream ss;
- Arabica::DOM::Node<std::string> content = req.dom.getDocumentElement();
+// Arabica::DOM::Node<std::string> content = req.dom.getDocumentElement();
+ Arabica::DOM::Node<std::string> content = req.dom;
if (content && boost::iequals(content.getLocalName(), "content")) {
reply.headers["X-SCXML-Type"] = (HAS_ATTR(content, "type") ? ATTR(content, "type") : "replacechildren");
reply.headers["X-SCXML-XPath"] = (HAS_ATTR(content, "xpath") ? ATTR(content, "xpath") : "/html/body");
if (HAS_ATTR(content, "attr"))
reply.headers["X-SCXML-Attr"] = ATTR(content, "attr");
}
- ss << req.getFirstDOMElement();
+// ss << req.getFirstDOMElement();
+ ss << req.dom;
reply.content = ss.str();
reply.headers["Content-Type"] = "application/xml";
} else if (req.data) {