Add query in JCR controller

git-svn-id: https://svn.argeo.org/commons/trunk@3518 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
index 05befd68d6d3a6919e604ce6d91e390b992bf172..74a3ec3469368355b6901dbbd01cd4d2be83b5df 100644 (file)
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
@@ -10,13 +10,23 @@ import org.argeo.ArgeoException;
 import org.argeo.server.ServerAnswer;
 import org.argeo.server.ServerSerializer;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.AbstractView;
 
+/**
+ * Can be used as a standalone {@link View} or using
+ * {@link SerializingViewResolver}
+ */
 public class SerializingView extends AbstractView implements MvcConstants {
        private final String viewName;
        private final Locale locale;
 
-       private final ServerSerializer serializer;
+       private ServerSerializer serializer;
+
+       public SerializingView() {
+               this.viewName = null;
+               this.locale = Locale.getDefault();
+       }
 
        public SerializingView(String viewName, Locale locale,
                        ServerSerializer serializer) {
@@ -25,7 +35,7 @@ public class SerializingView extends AbstractView implements MvcConstants {
                this.serializer = serializer;
        }
 
-       @SuppressWarnings({ "unchecked", "restriction" })
+       @SuppressWarnings( { "unchecked", "restriction" })
        @Override
        protected void renderMergedOutputModel(Map model,
                        HttpServletRequest request, HttpServletResponse response)
@@ -68,7 +78,7 @@ public class SerializingView extends AbstractView implements MvcConstants {
                        return model.get(ANSWER_MODEL_KEY);
                } else if (model.containsKey(ANSWER_MODEL_KEY_AS_HTML)) {
                        return model.get(ANSWER_MODEL_KEY_AS_HTML);
-               } else if (model.containsKey(viewName)) {
+               } else if (viewName != null && model.containsKey(viewName)) {
                        return model.get(viewName);
                } else {
                        if (model.size() == 0)
@@ -87,4 +97,8 @@ public class SerializingView extends AbstractView implements MvcConstants {
                return locale;
        }
 
+       public void setSerializer(ServerSerializer serializer) {
+               this.serializer = serializer;
+       }
+
 }

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java
index 26eab418a47b2e3468fcd67ade64bb1bc4f6b71c..c42e37fff60adcb12d7a550e4443df254d86fbef 100644 (file)
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java
@@ -2,6 +2,8 @@ package org.argeo.server.mvc;
 
 import java.util.Locale;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.server.ServerSerializer;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.view.AbstractCachingViewResolver;
@@ -10,10 +12,15 @@ import org.springframework.web.servlet.view.AbstractCachingViewResolver;
  * Returns a {@link SerializingView} based on the underlying.
  */
 public class SerializingViewResolver extends AbstractCachingViewResolver {
+       private final static Log log = LogFactory
+                       .getLog(SerializingViewResolver.class);
+
        private ServerSerializer serializer;
 
        @Override
        protected View loadView(String viewName, Locale locale) throws Exception {
+               if (log.isDebugEnabled())
+                       log.debug("viewName=" + viewName);
                return new SerializingView(viewName, locale, serializer);
        }
 

diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
index 298daeb3e96da0c81fa42fe4fbb41879393d837f..cddc8b01e09aa0f4a5d77167999d2f4bfc9f16fb 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
+++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/server/jcr/mvc/JcrBrowserController.java
@@ -1,8 +1,19 @@
 package org.argeo.server.jcr.mvc;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 import javax.jcr.Item;
+import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.Value;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
+import javax.jcr.query.Row;
+import javax.jcr.query.RowIterator;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,4 +31,44 @@ public class JcrBrowserController implements JcrMvcConstants {
                                RequestAttributes.SCOPE_REQUEST)).getItem(path);
        }
 
+       @RequestMapping("/queryJcrNodes.*")
+       public List<String> queryJcrNodes(WebRequest webRequest,
+                       @RequestParam("statement") String statement,
+                       @RequestParam("language") String language)
+                       throws RepositoryException {
+               Session session = ((Session) webRequest.getAttribute(
+                               REQUEST_ATTR_SESSION, RequestAttributes.SCOPE_REQUEST));
+               Query query = session.getWorkspace().getQueryManager().createQuery(
+                               statement, language);
+               NodeIterator nit = query.execute().getNodes();
+               List<String> paths = new ArrayList<String>();
+               while (nit.hasNext()) {
+                       paths.add(nit.nextNode().getPath());
+               }
+               return paths;
+       }
+
+       @RequestMapping("/queryJcrTable.*")
+       public List<List<String>> queryJcrTable(WebRequest webRequest,
+                       @RequestParam("statement") String statement,
+                       @RequestParam("language") String language)
+                       throws RepositoryException {
+               Session session = ((Session) webRequest.getAttribute(
+                               REQUEST_ATTR_SESSION, RequestAttributes.SCOPE_REQUEST));
+               Query query = session.getWorkspace().getQueryManager().createQuery(
+                               statement, language);
+               QueryResult queryResult = query.execute();
+               List<List<String>> results = new ArrayList<List<String>>();
+               results.add(Arrays.asList(queryResult.getColumnNames()));
+               RowIterator rit = queryResult.getRows();
+
+               while (rit.hasNext()) {
+                       Row row = rit.nextRow();
+                       List<String> lst = new ArrayList<String>();
+                       for (Value value : row.getValues()) {
+                               lst.add(value.getString());
+                       }
+               }
+               return results;
+       }
 }