Half decent error handling in scripts with project2:handler[try/catch/finally]

Component to validate a date string
Merge some code (fixes sqlmerge missing attachments to ifs)
Minor fixes
New changelog importer in GB

1 files changed, 4 insertions, 6 deletions

diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp
index e649551..afef7ab 100644
--- a/project2/cgi/cgiStageRequest.cpp
+++ b/project2/cgi/cgiStageRequest.cpp
@@ -6,21 +6,19 @@
 
 CgiApplicationEngine::RequestStage::RequestStage(const CgiEnvironment * e, const boost::filesystem::path & path) :
 	XmlScriptParser(path, false),
+	SourceObject(get_document()->get_root_node()),
 	::CheckHost(path),
 	CgiApplicationEngine::ResponseStage(e),
-	::TaskHost(path)
+	::TaskHost(path),
+	present(get_document()->get_root_node()->get_attribute_value("present"))
 {
-	xmlpp::Element * requestRoot = get_document()->get_root_node();
-	present = requestRoot->get_attribute_value("present");
-	rollbackBeforeHandle = requestRoot->get_attribute_value("rollbackBeforeHandle") == "true";
-	localErrorHandling = requestRoot->get_attribute_value("errorHandling") == "local";
 }
 
 CgiApplicationEngine::NextStage
 CgiApplicationEngine::RequestStage::run()
 {
 	runChecks();
-	executeTasks();
+	execute();
 	return NextStage(present.empty() ? NULL : new PresentStage(e, e->resolveScript(e->presentRoot, present)), this);
 }