Fix uniqueDefinition handling

- Size is wrong for /s prefix.
- Marshal definition name via query parameter to
  accomodate rev redirect.

Author: idodeclare

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

@@ -1355,6 +1355,11 @@ public String getRevisionLocation(String revStr) {
             sb.append("&");
             sb.append(req.getQueryString());
         }
+        String frag = req.getParameter(QueryParameters.FRAGMENT_IDENTIFIER_PARAM);
+        if (frag != null) {
+            sb.append("#");
+            sb.append(Util.URIEncode(frag));
+        }
 
         return sb.toString();
     }

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

@@ -20,6 +20,7 @@
 /*
  * Copyright (c) 2011 Jens Elkner.
  * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.web;
 
@@ -105,7 +106,7 @@ public String toString() {
      * @see #toString()
      */
     public static Prefix get(String servletPath) {
-        if (servletPath == null || servletPath.length() < 3 || servletPath.charAt(0) != '/') {
+        if (servletPath == null || servletPath.length() < 2 || servletPath.charAt(0) != '/') {
             return UNKNOWN;
         }
         int idx = servletPath.indexOf('/', 1);

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

@@ -77,6 +77,16 @@ public class QueryParameters {
      */
     public static final String FORMAT_PARAM_EQ = FORMAT_PARAM + "=";
 
+    /**
+     * Parameter name to specify a mediated fragment identifier.
+     */
+    public static final String FRAGMENT_IDENTIFIER_PARAM = "fi";
+
+    /**
+     * {@link #FRAGMENT_IDENTIFIER_PARAM} concatenated with {@code "=" }.
+     */
+    public static final String FRAGMENT_IDENTIFIER_PARAM_EQ = FRAGMENT_IDENTIFIER_PARAM + "=";
+
     /**
      * Parameter name to specify an OpenGrok full search.
      */

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

@@ -413,9 +413,11 @@ public SearchHelper executeQuery() {
                 }
             }
             if (uniqueDefinition) {
+                String anchor = Util.URIEncode(((TermQuery) query).getTerm().text());
                 redirect = contextPath + Prefix.XREF_P
                         + Util.URIEncodePath(searcher.doc(hits[0].doc).get(QueryBuilder.PATH))
-                        + '#' + Util.URIEncode(((TermQuery) query).getTerm().text());
+                        + '?' + QueryParameters.FRAGMENT_IDENTIFIER_PARAM_EQ + anchor
+                        + '#' + anchor;
             }
         } catch (BooleanQuery.TooManyClauses e) {
             errorMsg = "Too many results for wildcard!";

opengrok-indexer/src/test/java/org/opengrok/indexer/web/DummyHttpServletRequest.java

@@ -19,13 +19,15 @@
 
 /*
  * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2020, Chris Fraire <[email protected]>.
  */
 package org.opengrok.indexer.web;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -66,7 +68,9 @@
 public class DummyHttpServletRequest implements HttpServletRequest {
 
     private final Map<String, Object> attrs = new HashMap<>();
-    
+
+    private Map<String, String[]> parameters = Collections.emptyMap();
+
     private class DummyHttpSession implements HttpSession {
         private Map<String, Object> attrs = new HashMap<>();
 
@@ -159,7 +163,7 @@ public boolean isNew() {
     };
 
     private HttpSession session;
-    
+
     @Override
     public String getAuthType() {
         throw new UnsupportedOperationException("Not supported yet.");
@@ -368,23 +372,45 @@ public ServletInputStream getInputStream() throws IOException {
     }
 
     @Override
-    public String getParameter(String string) {
-        throw new UnsupportedOperationException("Not supported yet.");
+    public String getParameter(String name) {
+        String[] values = parameters.get(name);
+        if (values != null && values.length > 0) {
+            return values[0];
+        } else {
+            return null;
+        }
     }
 
     @Override
     public Enumeration<String> getParameterNames() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return Collections.enumeration(parameters.keySet());
     }
 
     @Override
-    public String[] getParameterValues(String string) {
-        throw new UnsupportedOperationException("Not supported yet.");
+    public String[] getParameterValues(String name) {
+        return parameters.get(name);
     }
 
     @Override
     public Map<String, String[]> getParameterMap() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return Collections.unmodifiableMap(parameters);
+    }
+
+    public void setParameterMap(Map<String, String[]> parameters) {
+        if (parameters == null) {
+            this.parameters = Collections.emptyMap();
+        } else {
+            this.parameters = new HashMap<>(parameters);
+            for (Map.Entry<String, String[]> entry : parameters.entrySet()) {
+                String[] values;
+                if (entry.getValue() == null) {
+                    values = new String[0];
+                } else {
+                    values = Arrays.copyOf(entry.getValue(), entry.getValue().length);
+                }
+                this.parameters.put(entry.getKey(), values);
+            }
+        }
     }
 
     @Override