Tried to add passing of template with EDIML. Still not working

fabiopavesi · fabiopavesi · commit 48c1ebdea043 · 2015-07-09T18:37:01.000+02:00
diff --git a/EDI-T/src/it/cnr/irea/ediT/model/TemplateElementList.java b/EDI-T/src/it/cnr/irea/ediT/model/TemplateElementList.java
@@ -14,7 +14,7 @@
 
 @XmlRootElement(name = "elements")
 @XmlAccessorType(XmlAccessType.PROPERTY)
-@XmlType(propOrder = { "generator", "ediVersion", "version", "timestamp", "baseDocument", "xsltChain", "numElements", "templateName", "fileId", "fileUri", "user", "queryString", "elements", "starterKitUri"} )
+@XmlType(propOrder = { "generator", "ediVersion", "version", "timestamp", "baseDocument", "xsltChain", "numElements", "templateName", "templateDocument", "fileId", "fileUri", "user", "queryString", "elements", "starterKitUri"} )
 @JsonPropertyOrder({
 	"generator", 
 	"ediVersion",
@@ -23,6 +23,7 @@
 	"baseDocument",
 	"xsltChain",
 	"templateName", 
+	"templateDocument",
 	"version", 
 	"fileId", 
 	"fileUri", 
@@ -36,6 +37,7 @@ public class TemplateElementList {
 	private Date timestamp = new Date();
 	private String queryString;
 	private String templateName;
+	private String templateDocument;
 	private String fileId;
 	private URI fileUri;
 	private String user;
@@ -163,7 +165,7 @@ public int getNumElements() {
 	
 	@XmlElement(name = "generator")
 	public String getGenerator() {
-		return "RITMARE Metadata Utilities Web Service";
+		return "RITMARE EDI_NG Server";
 	}
 
 	public String getStarterKitUri() {
@@ -186,5 +188,14 @@ public void setXsltChain(List<XsltUrl> xsltChain) {
 		this.xsltChain = xsltChain;
 	}
 
+	@XmlElement(name = "templateDocument")
+	public String getTemplateDocument() {
+		return templateDocument;
+	}
+
+	public void setTemplateDocument(String templateDocument) {
+		this.templateDocument = templateDocument;
+	}
+
 	
 }
diff --git a/EDI-T/src/it/cnr/irea/ediT/rest/RestBase.java b/EDI-T/src/it/cnr/irea/ediT/rest/RestBase.java
@@ -132,6 +132,7 @@ public ResponseEntity<PostMetadataResponse> postMetadataNG(HttpServletRequest re
 				TemplateElementList elementList = (TemplateElementList) 
 				um.unmarshal(new ByteArrayInputStream(xml.getBytes("utf-8")));
 				
+				log.severe("Template: " + elementList.getTemplateDocument().length() + " characters");
 				for ( TemplateElement element : elementList.getElements() ) {
 					for ( TemplateItem item : element.getItems() ) {
 						if ( item.getDataType() == null || item.getDataType().trim().equalsIgnoreCase("") ) {
diff --git a/EDI-T/src/it/cnr/irea/ediT/service/BaseService.java b/EDI-T/src/it/cnr/irea/ediT/service/BaseService.java
@@ -72,7 +72,7 @@ public void saveMetadata(MetadataTemplateDocument document, String xml, Template
 		   // metadata.setStarterKit(service.getSetting("starterKit", "noSK"));
 		   metadata.setProcessStarted(new Date());
 		   metadata.setInput(xml);
-			
+		   metadata.setTemplate(elementList.getTemplateDocument());
 		   metadata.setOutput(new String(document.xmlUTF8String(xmlDoc), "utf-8"));
 		   metadata.setProcessEnded(new Date());
 		   metadata.setSynchronised(false);
diff --git a/EDI-T/src/main/resources/static/index.html b/EDI-T/src/main/resources/static/index.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+	<p>test</p>
+</body>
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<html>
 +<body>
 +	<p>test</p>
 +</body>
 +</html>