X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=knowledge%2Forg.argeo.support.odk%2Fsrc%2Forg%2Fargeo%2Fsupport%2Fodk%2Fservlet%2FOdkFormListServlet.java;h=f829c12f92eba407afd9238c6fcceaabb2454a5a;hp=8398c7fa54769a3110aa6eaac54a7dbb7554b8a2;hb=780fe06055c67f30a1a0b55746f3cd4595532756;hpb=6d2f48507e5fbe512dca68726c7ba8529764ae0b

diff --git a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
index 8398c7f..f829c12 100644
--- a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
+++ b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
@@ -2,10 +2,21 @@ package org.argeo.support.odk.servlet;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.Property;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -13,7 +24,15 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.api.NodeConstants;
+import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.entity.EntityType;
+import org.argeo.jcr.Jcr;
+import org.argeo.jcr.JcrUtils;
+import org.argeo.jcr.JcrxApi;
 import org.argeo.support.odk.OdkForm;
+import org.argeo.support.odk.OdkNames;
+import org.argeo.support.odk.OrxListType;
 
 /** Lists available forms. */
 public class OdkFormListServlet extends HttpServlet {
@@ -22,6 +41,11 @@ public class OdkFormListServlet extends HttpServlet {
 
 	private Set<OdkForm> odkForms = Collections.synchronizedSet(new HashSet<>());
 
+	private DateTimeFormatter versionFormatter = DateTimeFormatter.ofPattern("YYYY-MM-dd-HHmm")
+			.withZone(ZoneId.from(ZoneOffset.UTC));
+
+	private Repository repository;
+
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		resp.setContentType("text/xml; charset=utf-8");
@@ -32,26 +56,101 @@ public class OdkFormListServlet extends HttpServlet {
 		int serverPort = req.getServerPort();
 		String protocol = serverPort == 443 || req.isSecure() ? "https" : "http";
 
+		String pathInfo = req.getPathInfo();
+
+		Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, NodeConstants.SYS_WORKSPACE), req);
+//		session = NodeUtils.openDataAdminSession(repository, NodeConstants.SYS_WORKSPACE);
 		Writer writer = resp.getWriter();
 		writer.append("<?xml version='1.0' encoding='UTF-8' ?>");
 		writer.append("<xforms xmlns=\"http://openrosa.org/xforms/xformsList\">");
-		for (OdkForm form : odkForms) {
-			StringBuilder sb = new StringBuilder();
-			sb.append("<xform>");
-			sb.append("<formID>" + form.getFormId() + "</formID>");
-			sb.append("<name>" + form.getName() + "</name>");
-			sb.append("<version>" + form.getVersion() + "</version>");
-			sb.append("<hash>" + form.getHash(null) + "</hash>");
-			sb.append("<descriptionText>" + form.getDescription() + "</descriptionText>");
-			sb.append("<downloadUrl>" + protocol + "://" + serverName
-					+ (serverPort == 80
-							|| serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/" + form.getFileName()
-					+ "</downloadUrl>");
-			sb.append("</xform>");
-			String str = sb.toString();
-			if (log.isDebugEnabled())
-				log.debug(str);
-			writer.append(str);
+		boolean oldApproach = false;
+		if (!oldApproach) {
+			try {
+
+				Query query;
+				if (pathInfo == null) {
+//				query = session.getWorkspace().getQueryManager()
+//						.createQuery("SELECT * FROM [nt:unstructured]", Query.JCR_SQL2);
+					query = session.getWorkspace().getQueryManager()
+							.createQuery("SELECT * FROM [" + OrxListType.xform.get() + "]", Query.JCR_SQL2);
+				} else {
+					query = session.getWorkspace().getQueryManager()
+							.createQuery(
+									"SELECT node FROM [" + OrxListType.xform.get()
+											+ "] AS node WHERE ISDESCENDANTNODE (node, '" + pathInfo + "')",
+									Query.JCR_SQL2);
+				}
+				QueryResult queryResult = query.execute();
+
+				NodeIterator nit = queryResult.getNodes();
+//				log.debug(session.getUserID());
+//				log.debug(session.getWorkspace().getName());
+//				NodeIterator nit = session.getRootNode().getNodes();
+//				while (nit.hasNext()) {
+//					log.debug(nit.nextNode());
+//				}
+				while (nit.hasNext()) {
+					StringBuilder sb = new StringBuilder();
+					Node node = nit.nextNode();
+					if (node.isNodeType(OrxListType.xform.get())) {
+						sb.append("<xform>");
+						sb.append("<formID>"
+								+ node.getNode(OdkNames.H_HTML + "/h:head/xforms:model/xforms:instance/xforms:data")
+										.getProperty("id").getString()
+								+ "</formID>");
+						sb.append("<name>" + Jcr.getTitle(node) + "</name>");
+						sb.append("<version>" + versionFormatter.format(JcrUtils.getModified(node)) + "</version>");
+//						sb.append("<version>" + versionFormatter.format(JcrUtils.getModified(node)) + "</version>");
+						sb.append("<hash>md5:" + JcrxApi.getChecksum(node, JcrxApi.MD5) + "</hash>");
+						if (node.hasProperty(Property.JCR_DESCRIPTION))
+							sb.append("<name>" + node.getProperty(Property.JCR_DESCRIPTION).getString() + "</name>");
+						sb.append("<downloadUrl>" + protocol + "://" + serverName
+								+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form/"
+								+ node.getPath() + "</downloadUrl>");
+						sb.append("</xform>");
+					} else if (node.isNodeType(EntityType.formSet.get())) {
+						sb.append("<xforms-group>");
+						sb.append("<groupId>" + node.getPath() + "</groupId>");
+						sb.append("<name>" + node.getProperty(Property.JCR_TITLE).getString() + "</name>");
+						sb.append("<listUrl>" + protocol + "://" + serverName
+								+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/formList"
+								+ node.getPath() + "</listUrl>");
+						sb.append("</xforms-group>");
+					}
+					String str = sb.toString();
+					if (!str.equals("")) {
+						if (log.isDebugEnabled())
+							log.debug(str);
+						writer.append(str);
+					}
+				}
+			} catch (RepositoryException e) {
+				e.printStackTrace();
+				// TODO error message
+				// resp.sendError(500);
+				resp.sendError(503);
+			} finally {
+				Jcr.logout(session);
+			}
+
+		} else {
+			for (OdkForm form : odkForms) {
+				StringBuilder sb = new StringBuilder();
+				sb.append("<xform>");
+				sb.append("<formID>" + form.getFormId() + "</formID>");
+				sb.append("<name>" + form.getName() + "</name>");
+				sb.append("<version>" + form.getVersion() + "</version>");
+				sb.append("<hash>" + form.getHash(null) + "</hash>");
+				sb.append("<descriptionText>" + form.getDescription() + "</descriptionText>");
+				sb.append("<downloadUrl>" + protocol + "://" + serverName
+						+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort) + "/api/odk/form/"
+						+ form.getFileName() + "</downloadUrl>");
+				sb.append("</xform>");
+				String str = sb.toString();
+				if (log.isDebugEnabled())
+					log.debug(str);
+				writer.append(str);
+			}
 		}
 		writer.append("</xforms>");
 	}
@@ -63,4 +162,9 @@ public class OdkFormListServlet extends HttpServlet {
 	public void removeForm(OdkForm odkForm) {
 		odkForms.remove(odkForm);
 	}
+
+	public void setRepository(Repository repository) {
+		this.repository = repository;
+	}
+
 }