ODK servlets based on JCR.

[gpl/argeo-suite.git] / knowledge / org.argeo.support.odk / src / org / argeo / support / odk / servlet / OdkFormServlet.java

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 93f41479ded820342874e326a9ced9631af4db66..301e1bb433d9bcc52c8768829378677d6416e831 100644 (file)
--- 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
@@ -16,9 +16,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;

-import org.argeo.cms.auth.ServletAuthUtils;
+import org.argeo.cms.servlet.ServletAuthUtils;

 import org.argeo.jcr.Jcr;
 import org.argeo.support.odk.OdkForm;
 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 {
 
 /** Retrieves a single form. */
 public class OdkFormServlet extends HttpServlet {


@@ -35,9 +36,10 @@ public class OdkFormServlet extends HttpServlet {
 
                String pathInfo = req.getPathInfo();
 
 
                String pathInfo = req.getPathInfo();
 

+               boolean oldApproach = false;

                try {
                try {

-                       if (session.nodeExists(pathInfo)) {
-                               session.exportDocumentView(pathInfo + "/h:html", resp.getOutputStream(), true, false);
+                       if (!oldApproach) {
+                               session.exportDocumentView(pathInfo + "/" + OdkNames.H_HTML, resp.getOutputStream(), true, false);

                        } else {
 
                                String fileName = FilenameUtils.getName(pathInfo);
                        } else {
 
                                String fileName = FilenameUtils.getName(pathInfo);