projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce XML upload.
[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..7b727e32591dc4a8fe7c2e22965c09522741316f 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 {
@@
-34,10
+35,13
@@
public class OdkFormServlet extends HttpServlet {
Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
String pathInfo = req.getPathInfo();
Session session = ServletAuthUtils.doAs(() -> Jcr.login(repository, null), req);
String pathInfo = req.getPathInfo();
+ if (pathInfo.startsWith("//"))
+ pathInfo = pathInfo.substring(1);
+ 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);