Add hidden #xrd to manage redirect/no-redirect

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/web/PageConfig.java

@@ -1527,6 +1527,8 @@ public SearchHelper prepareInternalSearch() {
         sh.isGuiSearch = sh.isCrossRefSearch || getPrefix() == Prefix.SEARCH_P;
         sh.desc = getEftarReader();
         sh.sourceRoot = new File(getSourceRootPath());
+        String xrValue = req.getParameter(QueryParameters.NO_REDIRECT_PARAM);
+        sh.noRedirect = xrValue != null && !xrValue.isEmpty();
         return sh;
     }
 

opengrok-indexer/src/main/java/org/opengrok/indexer/web/QueryParameters.java

@@ -117,6 +117,13 @@ public class QueryParameters {
      */
     public static final String MATCH_OFFSET_PARAM_EQ = MATCH_OFFSET_PARAM + "=";
 
+    /**
+     * Parameter name to specify a value indicating if redirection should be
+     * short-circuited when state or query result would have an indicated
+     * otherwise.
+     */
+    public static final String NO_REDIRECT_PARAM = "xrd";
+
     /**
      * Parameter name to specify an OpenGrok search of paths.
      */

opengrok-indexer/src/main/java/org/opengrok/indexer/web/Scripts.java

@@ -110,7 +110,7 @@ public String toHtml() {
         putjs("jquery-ui", "js/jquery-ui-1.12.1-custom", 11);
         putjs("jquery-tablesorter", "js/jquery-tablesorter-2.26.6", 12);
         putjs("tablesorter-parsers", "js/tablesorter-parsers-0.0.2", 13, true);
-        putjs("searchable-option-list", "js/searchable-option-list-2.0.11", 14);
+        putjs("searchable-option-list", "js/searchable-option-list-2.0.12", 14);
         putjs("utils", "js/utils-0.0.34", 15, true);
         putjs("repos", "js/repos-0.0.2", 20, true);
         putjs("diff", "js/diff-0.0.4", 20, true);

opengrok-indexer/src/main/java/org/opengrok/indexer/web/SearchHelper.java

@@ -156,6 +156,11 @@ public class SearchHelper {
      * set via {@link #prepareExec(SortedSet)} and {@link #executeQuery()}.
      */
     public String redirect;
+    /**
+     * A value indicating if redirection should be short-circuited when state or
+     * query result would have indicated otherwise.
+     */
+    public boolean noRedirect;
     /**
      * if not {@code null}, the UI should show this error message and stop
      * processing the search. Automatically set via
@@ -404,7 +409,7 @@ public SearchHelper executeQuery() {
              * Determine if possibly a single-result redirect to xref is
              * eligible and applicable. If history query is active, then nope.
              */
-            if (hits != null && hits.length == 1 && builder.getHist() == null) {
+            if (!noRedirect && hits != null && hits.length == 1 && builder.getHist() == null) {
                 int docID = hits[0].doc;
                 if (isCrossRefSearch && query instanceof TermQuery && builder.getDefs() != null) {
                     maybeRedirectToDefinition(docID, (TermQuery) query);

opengrok-web/src/main/webapp/js/searchable-option-list-2.0.11.js renamed to opengrok-web/src/main/webapp/js/searchable-option-list-2.0.12.js

@@ -1094,6 +1094,7 @@
                          * Modified for OpenGrok in 2017.
                          */
                         if (isOnSearchPage()) {
+                            $('#xrd').val("1"); // no redirect
                             $('#sbox').submit();
                         }
                     })

opengrok-web/src/main/webapp/menu.jspf

@@ -230,7 +230,8 @@ document.domReady.push(function() { domReadyMenu(); });
     </tbody>
 </table>
 <div id="form-controls">
-    <input tabindex="9" class="submit btn" type="submit" value="Search"/>
+    <input tabindex="9" class="submit btn" onclick="$('#xrd').val(''); $('#sbox').submit()"
+           type="button" value="Search"/>
     <input tabindex="10" class="submit btn" onclick="javascript: clearSearchFrom();"
            type="button" value="Clear"/>
     <input tabindex="11" class="submit btn" onclick="window.open('help.jsp', '_blank');"
@@ -240,6 +241,8 @@ document.domReady.push(function() { domReadyMenu(); });
 <div id="ltbl">
     <!-- filled with javascript -->
 </div>
+<input type="hidden" id="<%= QueryParameters.NO_REDIRECT_PARAM %>"
+       name="<%= QueryParameters.NO_REDIRECT_PARAM %>" value=""/>
 </form>
 <div class="clearfix"></div>
 <%