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%2FOdkFormServlet.java;h=7b727e32591dc4a8fe7c2e22965c09522741316f;hp=3746da852aaefbb0826cc32673a40fec0b53266d;hb=780fe06055c67f30a1a0b55746f3cd4595532756;hpb=6d2f48507e5fbe512dca68726c7ba8529764ae0b

diff --git a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
index 3746da8..7b727e3 100644
--- a/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
+++ b/knowledge/org.argeo.support.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
@@ -7,35 +7,61 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
+import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;
+import org.argeo.support.odk.OdkNames;
 
 /** Retrieves a single form. */
 public class OdkFormServlet extends HttpServlet {
 	private static final long serialVersionUID = 7838305967987687370L;
 
+	private Repository repository;
 	private Map<String, OdkForm> odkForms = Collections.synchronizedMap(new HashMap<>());
 
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		resp.setContentType("text/xml; charset=utf-8");
 
-		String path = req.getServletPath();
-		String fileName = FilenameUtils.getName(path);
-		OdkForm form = odkForms.get(fileName);
-		if (form == null)
-			throw new IllegalArgumentException("No form named " + fileName + " was found");
-
-		byte[] buffer = new byte[1024];
-		try (InputStream in = form.openStream(); OutputStream out = resp.getOutputStream();) {
-			int bytesRead;
-			while ((bytesRead = in.read(buffer)) != -1)
-				out.write(buffer, 0, bytesRead);
+		Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
+
+		String pathInfo = req.getPathInfo();
+		if (pathInfo.startsWith("//"))
+			pathInfo = pathInfo.substring(1);
+
+		boolean oldApproach = false;
+		try {
+			if (!oldApproach) {
+				session.exportDocumentView(pathInfo + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false);
+			} else {
+
+				String fileName = FilenameUtils.getName(pathInfo);
+				OdkForm form = odkForms.get(fileName);
+				if (form == null)
+					throw new IllegalArgumentException("No form named " + fileName + " was found");
+
+				byte[] buffer = new byte[1024];
+				try (InputStream in = form.openStream(); OutputStream out = resp.getOutputStream();) {
+					int bytesRead;
+					while ((bytesRead = in.read(buffer)) != -1)
+						out.write(buffer, 0, bytesRead);
+				}
+			}
+		} catch (RepositoryException e) {
+			e.printStackTrace();
+			// TODO error message
+			resp.sendError(500);
+		} finally {
+			Jcr.logout(session);
 		}
 	}
 
@@ -47,4 +73,8 @@ public class OdkFormServlet extends HttpServlet {
 		odkForms.remove(odkForm.getFileName());
 	}
 
+	public void setRepository(Repository repository) {
+		this.repository = repository;
+	}
+
 }