Disable old odk approach

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

diff --git a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
index 067262edc097d96e4166a43479fe41d8d8219335..d236bc5c726167352edc305449ef09af582f75c7 100644 (file)
--- a/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
@@ -1,13 +1,8 @@
 package org.argeo.app.servlet.odk;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -17,8 +12,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.io.FilenameUtils;
-import org.argeo.app.odk.OdkForm;
 import org.argeo.app.odk.OdkNames;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
@@ -29,7 +22,7 @@ public class OdkFormServlet extends HttpServlet {
        private static final long serialVersionUID = 7838305967987687370L;
 
        private Repository repository;
-       private Map<String, OdkForm> odkForms = Collections.synchronizedMap(new HashMap<>());
+//     private Map<String, OdkForm> odkForms = Collections.synchronizedMap(new HashMap<>());
 
        @Override
        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -41,25 +34,25 @@ public class OdkFormServlet extends HttpServlet {
                if (pathInfo.startsWith("//"))
                        pathInfo = pathInfo.substring(1);
 
-               boolean oldApproach = false;
+//             boolean oldApproach = false;
                try {
-                       if (!oldApproach) {
-                               String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8);
-                               session.exportDocumentView(path + "/" + 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);
-                               }
-                       }
+//                     if (!oldApproach) {
+                       String path = URLDecoder.decode(pathInfo, StandardCharsets.UTF_8);
+                       session.exportDocumentView(path + "/" + 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
@@ -69,13 +62,13 @@ public class OdkFormServlet extends HttpServlet {
                }
        }
 
-       public void addForm(OdkForm odkForm) {
-               odkForms.put(odkForm.getFileName(), odkForm);
-       }
-
-       public void removeForm(OdkForm odkForm) {
-               odkForms.remove(odkForm.getFileName());
-       }
+//     public void addForm(OdkForm odkForm) {
+//             odkForms.put(odkForm.getFileName(), odkForm);
+//     }
+//
+//     public void removeForm(OdkForm odkForm) {
+//             odkForms.remove(odkForm.getFileName());
+//     }
 
        public void setRepository(Repository repository) {
                this.repository = repository;