provide tag in search results

Author: vladak

apiary.apib

@@ -576,19 +576,32 @@ The repository path is relative to source root.
   + Body
 
             {
-              "time": 13,
-              "resultCount": 35,
+              "time": 1229,
+              "resultCount": 8,
               "startDocument": 0,
-              "endDocument": 0,
+              "endDocument": 7,
               "results": {
-                "/opengrok/test/org/opensolaris/opengrok/history/hg-export-renamed.txt": [{
-                  "line": "# User Vladimir <b>Kotal</b> &lt;Vladimir.<b>Kotal</b>@oracle.com&gt;",
-                  "lineNumber": "19"
-                },{
-                  "line": "# User Vladimir <b>Kotal</b> &lt;Vladimir.<b>Kotal</b>@oracle.com&gt;",
-                  "lineNumber":"29"
-                }]
+                "/onnv/usr/src/lib/libnisdb/db_pickle.cc": [
+                  {
+                    "line": "pickle_file::<b>transfer</b>(pptr p, bool_t (*f) (XDR*, pptr))",
+                    "lineNumber": "106",
+                    "tag": "function in pickle_file"
+                  }
+                ],
+                "/onnv/usr/src/cmd/pools/poold/com/sun/solaris/service/pools/Resource.java": [
+                  {
+                    "line": "\tpublic void <b>transfer</b>(Resource donor, long qty) throws PoolsException",
+                    "lineNumber": "93",
+                    "tag": "method in Resource"
+                  },
+                  {
+                    "line": "\tpublic void <b>transfer</b>(Resource donor, List components)",
+                    "lineNumber": "110",
+                    "tag": "method in Resource"
+                  }
+                ],
               }
+            }
 
 ## Suggester [/suggest{?projects,field,caret,full,defs,refs,path,hist,type}]
 

opengrok-web/src/main/java/org/opengrok/web/api/v1/controller/SearchController.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2020, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.web.api.v1.controller;
@@ -91,7 +91,8 @@ public SearchResult search(
             Map<String, List<SearchHit>> hits = engine.search(req, projects, startDocIndex, maxResults)
                     .stream()
                     .collect(Collectors.groupingBy(Hit::getPath,
-                            Collectors.mapping(h -> new SearchHit(h.getLine(), h.getLineno()), Collectors.toList())));
+                            Collectors.mapping(h -> new SearchHit(h.getLine(), h.getLineno(), h.getTag()),
+                                    Collectors.toList())));
 
             long duration = Duration.between(startTime, Instant.now()).toMillis();
 
@@ -220,9 +221,12 @@ private static class SearchHit {
 
         private final String lineNumber;
 
-        private SearchHit(final String line, final String lineNumber) {
+        private final String tag;
+
+        private SearchHit(final String line, final String lineNumber, final String tag) {
             this.line = line;
             this.lineNumber = lineNumber;
+            this.tag = tag;
         }
 
         public String getLine() {
@@ -232,6 +236,10 @@ public String getLine() {
         public String getLineNumber() {
             return lineNumber;
         }
+
+        public String getTag() {
+            return tag;
+        }
     }
 
 }