Finer control over output to presenters, addresses issues with JSON output and makes some other bits more sensible

Tweaks to XSLT as some things have moved

1 files changed, 5 insertions, 11 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index d062d87..be42af9 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -196,11 +196,11 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 		// URL elements
 		p->addNewRowSet("uriElems", env()->scriptNamespacePrefix);
 		p->addAttribute("full", _env->getRedirectURL());
+		p->addNewArray("uriElem", true);
 		BOOST_FOREACH(std::string s, _env->elems) {
-			p->addNewRow("uriElem");
-			p->addAttribute("text", s);
-			p->finishRow();
+			p->addNamedValue("uriElem", s);
 		}
+		p->finishArray(true);
 		p->finishRowSet();
 	}
 
@@ -208,10 +208,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 		// Parameters
 		p->addNewRowSet("params", env()->scriptNamespacePrefix);
 		BOOST_FOREACH(cgicc::FormEntry fe, _env->cgi->getElements()) {
-			p->addNewRow("param");
-			p->addAttribute("name", fe.getName());
-			p->addAttribute("value", fe.getValue());
-			p->finishRow();
+			p->addNamedValue(fe.getName(), fe.getValue());
 		}
 		p->finishRowSet();
 	}
@@ -220,10 +217,7 @@ CgiApplicationEngine::addEnvData(const MultiRowSetPresenter * p, OutputOptionsPt
 void
 CgiApplicationEngine::addVarToPresenter(const MultiRowSetPresenter * p, const Glib::ustring & name, const VariableType & value) const
 {
-	p->addNewRow("var");
-	p->addAttribute("name", name);
-	p->addAttribute("value", value);
-	p->finishRow();
+	p->addNamedValue(name, value);
 }
 
 void