REPORT-908 Unescape XML before deserializing column definition (#259)

Author: xprl-gjf

omod/src/main/java/org/openmrs/module/reporting/web/datasets/PatientDataSetEditor.java

@@ -19,6 +19,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.context.Context;
@@ -193,7 +194,7 @@ public String addColumn(@RequestParam(value="label", required=false) String labe
     	}
 
 		MappedEditor editor = new MappedEditor();
-		editor.setAsText(columnDefinition);
+		editor.setAsText(StringEscapeUtils.unescapeXml(columnDefinition));
 		Mapped<DataDefinition> mappedDef = (Mapped<DataDefinition>) editor.getValue();
 
     	dsd.addColumn(label, mappedDef.getParameterizable(), mappedDef.getParameterMappings());