summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/invoker/xhtml
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-01 12:55:04 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-08-01 12:55:04 (GMT)
commit3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253 (patch)
tree41f234c33e1e04015ef92a6b94212d9c7e97ad72 /src/uscxml/plugins/invoker/xhtml
parent720bbe5c1b8c0789b5c7ad9ffca33e52bf77f1da (diff)
downloaduscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.zip
uscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.tar.gz
uscxml-3df6c9c6630f3b3b9b0876ae5bc8f2d12a15b253.tar.bz2
Bug fixes and version bump
- New calendar invoker - Fixed memory leaks with JavaScriptCore - Compiles on windows again - Beautified source code indentation
Diffstat (limited to 'src/uscxml/plugins/invoker/xhtml')
-rw-r--r--src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
index 4e2c01a..82e0a48 100644
--- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp
@@ -92,7 +92,7 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
} else if(_invokeReq.data) {
ss << _invokeReq.data;
content = ss.str();
- } else if (_invokeReq.content.length() > 0){
+ } else if (_invokeReq.content.length() > 0) {
content = _invokeReq.content;
} else {
URL templateURL("templates/xhtml-invoker.html");
@@ -100,10 +100,10 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) {
templateURL.download(true);
content = templateURL.getInContent();
}
-
+
_interpreter->getDataModel().replaceExpressions(content);
reply.content = content;
-
+
// application/xhtml+xml
reply.headers["Content-Type"] = "text/html; charset=utf-8";
// reply.headers["Content-Type"] = "application/xhtml+xml; charset=utf-8";
@@ -140,7 +140,7 @@ void XHTMLInvoker::send(const SendRequest& req) {
if (json) {
reqCopy.data = json;
}
-
+
if (!_longPoll) {
_outQueue.push_back(reqCopy);
return;
@@ -154,7 +154,7 @@ void XHTMLInvoker::reply(const SendRequest& req, const HTTPServer::Request& long
// is there JSON in the content?
std::string content = req.content;
-
+
if (req.dom) {
std::stringstream ss;
Arabica::DOM::Node<std::string> content = req.dom.getDocumentElement();