From a204b495085baec8959d1db0969785b7f3fb3335 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 10 Nov 2020 08:32:26 +0100
Subject: [PATCH] Introduce graphical support based on SVG naming.

---
 .../odk/servlet/OdkSubmissionServlet.java     | 32 ++++++++-----------
 .../src/org/argeo/entity/EntityType.java      |  2 ++
 .../src/org/argeo/entity/entity.cnd           | 12 +++++++
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
index 862ff36..f1a1d84 100644
--- a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
+++ b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
@@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter;
 
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
+import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -22,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.servlet.ServletAuthUtils;
 import org.argeo.entity.EntityNames;
+import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.support.odk.OrxType;
@@ -49,7 +51,7 @@ public class OdkSubmissionServlet extends HttpServlet {
 
 		try {
 			Node submissions = JcrUtils.mkdirs(session,
-					"/" + EntityNames.FORM_BASE + "/" + EntityNames.SUBMISSIONS_BASE);
+					"/" + EntityType.form.get() + "/" + EntityNames.SUBMISSIONS_BASE);
 			Node submission = submissions.addNode(submissionNameFormatter.format(Instant.now()),
 					OrxType.submission.get());
 			for (Part part : req.getParts()) {
@@ -61,25 +63,17 @@ public class OdkSubmissionServlet extends HttpServlet {
 					session.importXML(xml.getPath(), part.getInputStream(),
 							ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING);
 
-//					Part xmlSubmissionPart = req.getPart(XML_SUBMISSION_FILE);
-//					if (xmlSubmissionPart == null)
-//						throw new ServletException("No " + XML_SUBMISSION_FILE + " part");
-//				try (InputStream in = xmlSubmissionPart.getInputStream();) {
-//					// pretty print
-//					Transformer transformer = TransformerFactory.newInstance().newTransformer();
-//					transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-//					transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-//					StreamResult result = new StreamResult(new StringWriter());
-//					StreamSource source = new StreamSource(in);
-//					transformer.transform(source, result);
-//					String xmlString = result.getWriter().toString();
-//					System.out.println(xmlString);
-//				} catch (TransformerException e) {
-//					e.printStackTrace();
-//				}
-
 				} else {
-					JcrUtils.copyStreamAsFile(submission, part.getName(), part.getInputStream());
+					Node fileNode = JcrUtils.copyStreamAsFile(submission, part.getName(), part.getInputStream());
+					String contentType = part.getContentType();
+					if (contentType != null) {
+						fileNode.addMixin(NodeType.MIX_MIMETYPE);
+						fileNode.setProperty(Property.JCR_MIMETYPE, contentType);
+
+					}
+					if (part.getName().endsWith(".jpg") || part.getName().endsWith(".png")) {
+						// TODO meta data and thumbnails
+					}
 				}
 			}
 			session.save();
diff --git a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
index 7b470bb..822bbd9 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
+++ b/org.argeo.entity.api/src/org/argeo/entity/EntityType.java
@@ -8,6 +8,8 @@ public enum EntityType implements JcrName {
 	typologies, terms, term,
 	// form
 	form, formSet, formSubmission,
+	// graphics
+	box,
 	// ldap
 	person;
 
diff --git a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
index 12d1ba6..80328db 100644
--- a/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
+++ b/org.argeo.entity.api/src/org/argeo/entity/entity.cnd
@@ -3,6 +3,7 @@
 <h = "http://www.w3.org/1999/xhtml">
 // see https://www.w3.org/2003/01/geo/
 //<geo = "http://www.w3.org/2003/01/geo/wgs84_pos#">
+<svg = "http://www.w3.org/2000/svg">
 
 <ldif = "http://www.argeo.org/ns/ldif">
 <entity = 'http://www.argeo.org/ns/entity'>
@@ -56,6 +57,17 @@ mixin
 [entity:formSet] > mix:title
 mixin
 
+//
+// GRAPHICS
+//
+[entity:box]
+mixin
+- svg:width (DOUBLE)
+- svg:height (DOUBLE)
+- svg:length (DOUBLE)
+- svg:unit (STRING)
+- svg:dur (DOUBLE)
+
 // LDAP-LIKE ENTITIES
 // A real person
 [entity:person] > entity:entity
-- 
2.30.2