Json servlet updates (#1467)

Author: pmv

src/org/opensolaris/opengrok/search/SearchEngine.java

@@ -31,8 +31,12 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.SortedSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -235,6 +239,38 @@ public String getQuery() {
         return query.toString();
     }
 
+    /**
+     * Execute a search aware of current request, limited to specific project names.
+     *
+     * This filters out all projects which are not allowed for the current request.
+     *
+     * Before calling this function,
+     * you must set the appropriate search criteria with the set-functions. Note
+     * that this search will return the first cachePages of hitsPerPage, for
+     * more you need to call more.
+     *
+     * Call to search() must be eventually followed by call to destroy()
+     * so that IndexSearcher objects are properly freed.
+     *
+     * @return The number of hits
+     * @see ProjectHelper#getAllProjects()
+     */
+    public int search(HttpServletRequest req, String... projectNames) {
+        ProjectHelper pHelper = PageConfig.get(req).getProjectHelper();
+        Set<Project> projects = pHelper.getAllProjects();
+        List<Project> filteredProjects = new ArrayList<Project>();
+        for(Project project: projects) {
+            for (String name : projectNames) {
+                if(project.getName().equalsIgnoreCase(name)) {
+                    filteredProjects.add(project);
+                }
+            }
+        }
+        return search(
+                filteredProjects,
+                new File(RuntimeEnvironment.getInstance().getDataRootFile(), IndexDatabase.INDEX_DIR));
+    }
+
     /**
      * Execute a search aware of current request. 
      * 

src/org/opensolaris/opengrok/web/JSONSearchServlet.java

@@ -18,7 +18,7 @@
  */
 
  /*
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
  */
 package org.opensolaris.opengrok.web;
 
@@ -47,6 +47,7 @@ public class JSONSearchServlet extends HttpServlet {
     private static final String PARAM_PATH = "path";
     private static final String PARAM_HIST = "hist";
     private static final String PARAM_MAXRESULTS = "maxresults";
+    private static final String PARAM_PROJECT = "project";
     private static final String ATTRIBUTE_DIRECTORY = "directory";
     private static final String ATTRIBUTE_FILENAME = "filename";
     private static final String ATTRIBUTE_LINENO = "lineno";
@@ -70,6 +71,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
         String symbol = req.getParameter(PARAM_SYMBOL);
         String path = req.getParameter(PARAM_PATH);
         String hist = req.getParameter(PARAM_HIST);
+        String projects[] = req.getParameterValues(PARAM_PROJECT);
 
         if (freetext != null) {
             freetext = URLDecoder.decode(freetext);
@@ -112,7 +114,12 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 
         try {
             long start = System.currentTimeMillis();
-            int numResults = engine.search(req);
+            int numResults;
+            if(projects == null || projects.length == 0) {
+                numResults = engine.search(req);
+            } else {
+                numResults = engine.search(req, projects);
+            }
             int maxResults = MAX_RESULTS;
             String maxResultsParam = req.getParameter(PARAM_MAXRESULTS);
             if (maxResultsParam != null) {
@@ -146,7 +153,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             result.put(ATTRIBUTE_RESULTS, resultsArray);
 
 
-
+            resp.setContentType("application/json");
             resp.getWriter().write(result.toString());
         } finally {
             engine.destroy();