Implemented StylesheetParameterGuard class

* removes responsibility for clearing parameters from the generate member methods
* abstracts parameter escaping and setting and handles map conversion
* marked actual generate member method as private and added StylesheetParameterGuard reference argument
** "frontend" generate member methods instantiate a StylesheetParameterGuard instance and pass it to the actual generate method
** this enables central default parameter definition while offering the possibility for custom parameters

1 files changed, 24 insertions, 24 deletions

diff --git a/src/transformation_facade.cc b/src/transformation_facade.cc
index b411b38..698cdb1 100644
--- a/src/transformation_facade.cc
+++ b/src/transformation_facade.cc
@@ -26,14 +26,34 @@ TransformationFacade::~TransformationFacade() {
 }
 
 int TransformationFacade::generate(const std::string& target) {
+	StylesheetParameterGuard guard(this->transformer_);
+
+	return this->generate(target, guard);
+}
+
+int TransformationFacade::generate(
+	const std::string& target,
+	const StylesheetParameterGuard::map& parameters
+) {
+	StylesheetParameterGuard guard(this->transformer_, parameters);
+
+	return this->generate(target, guard);
+}
+
+int TransformationFacade::generate(
+	const std::string& target,
+	StylesheetParameterGuard& parameters
+) {
 	const boost::filesystem::path targetFilePath(
 		boost::filesystem::absolute(target)
 	);
 
-	this->setParameters({
-		{ "target-file",      targetFilePath.filename().string()               },
-		{ "parent-directory", targetFilePath.parent_path().filename().string() }
-	});
+	parameters.set(
+		"target-file",      targetFilePath.filename().string()
+	);
+	parameters.set(
+		"parent-directory", targetFilePath.parent_path().filename().string()
+	);
 
 	std::stringstream       emptyStream("<dummy/>");
 	xalan::XSLTInputSource  inputSource(emptyStream);
@@ -49,27 +69,7 @@ int TransformationFacade::generate(const std::string& target) {
 		std::cerr << this->transformer_.getLastError() << std::endl;
 	}
 
-	this->transformer_.clearStylesheetParams();
-
 	return resultCode;
 }
 
-int TransformationFacade::generate(
-	const std::string& target,
-	const parameter_map& parameters
-) {
-	this->setParameters(parameters);
-
-	return this->generate(target);
-}
-
-void TransformationFacade::setParameters(const parameter_map& parameters) {
-	for ( auto&& parameter : parameters ) {
-		this->transformer_.setStylesheetParam(
-			parameter.first.data(),
-			std::string("'" + parameter.second + "'").data()
-		);
-	}
-}
-
 }