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=7c752c7ed60c4a51b4b4a336d3d22a1fc0a64994;hp=cc892a8b3c195ef0424d0277e11d221d70361f5e;hb=384e41caf78222c53e5cf365bb93310e5b28462b;hpb=702f22eb8cbcb56c927dc21226ee22696426647b

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 cc892a8..7c752c7 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,6 @@ package org.argeo.support.odk.servlet;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.security.AccessControlContext;
-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;
@@ -16,7 +12,8 @@ import javax.jcr.Property;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.security.auth.Subject;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -25,14 +22,13 @@ 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.api.NodeUtils;
-import org.argeo.cms.auth.ServletAuthUtils;
+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.OrxListType;
+import org.argeo.support.odk.OrxListName;
+import org.argeo.support.odk.OrxManifestName;
 
 /** Lists available forms. */
 public class OdkFormListServlet extends HttpServlet {
@@ -41,8 +37,8 @@ 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 DateTimeFormatter versionFormatter = DateTimeFormatter.ofPattern("YYYY-MM-dd-HHmm")
+//			.withZone(ZoneId.from(ZoneOffset.UTC));
 
 	private Repository repository;
 
@@ -58,55 +54,57 @@ public class OdkFormListServlet extends HttpServlet {
 
 		String pathInfo = req.getPathInfo();
 
-		Subject subject = Subject
-				.getSubject((AccessControlContext) req.getAttribute(AccessControlContext.class.getName()));
-		log.debug("SERVLET CONTEXT: " + subject);
-
 		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\">");
-		boolean newApproach = true;
-		if (newApproach)
+		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 query;
+				if (pathInfo == null) {
 //				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());
+//						.createQuery("SELECT * FROM [nt:unstructured]", Query.JCR_SQL2);
+					query = session.getWorkspace().getQueryManager()
+							.createQuery("SELECT * FROM [" + OrxListName.xform.get() + "]", Query.JCR_SQL2);
+				} else {
+					query = session.getWorkspace().getQueryManager()
+							.createQuery(
+									"SELECT node FROM [" + OrxListName.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())) {
+					if (node.isNodeType(OrxListName.xform.get())) {
 						sb.append("<xform>");
-						sb.append("<formID>" + node.getNode("h:html").getIdentifier() + "</formID>");
-						sb.append("<name>" + node.getProperty(Property.JCR_TITLE).getString() + "</name>");
-						sb.append("<version>" + versionFormatter.format(JcrUtils.getModified(node)) + "</version>");
+						sb.append("<formID>" + node.getProperty(OrxListName.formID.get()).getString() + "</formID>");
+						sb.append("<name>" + Jcr.getTitle(node) + "</name>");
+						sb.append("<version>" + node.getProperty(OrxListName.version.get()).getString() + "</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>");
+						if (node.hasNode(OrxManifestName.manifest.name())) {
+							sb.append("<manifestUrl>" + protocol + "://" + serverName
+									+ (serverPort == 80 || serverPort == 443 ? "" : ":" + serverPort)
+									+ "/api/odk/formManifest" + node.getNode(OrxManifestName.manifest.name()).getPath()
+									+ "</manifestUrl>");
+						}
 						sb.append("</xform>");
 					} else if (node.isNodeType(EntityType.formSet.get())) {
 						sb.append("<xforms-group>");
@@ -128,12 +126,12 @@ public class OdkFormListServlet extends HttpServlet {
 				e.printStackTrace();
 				// TODO error message
 				// resp.sendError(500);
+				resp.sendError(503);
 			} finally {
 				Jcr.logout(session);
 			}
 
-		boolean oldApproach = true;
-		if (oldApproach)
+		} else {
 			for (OdkForm form : odkForms) {
 				StringBuilder sb = new StringBuilder();
 				sb.append("<xform>");
@@ -151,6 +149,7 @@ public class OdkFormListServlet extends HttpServlet {
 					log.debug(str);
 				writer.append(str);
 			}
+		}
 		writer.append("</xforms>");
 	}