Modified 'Definitions' search to only return where actual definitions of functions/variables/macros/etc are found

Author: Alex Devlin

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

@@ -202,8 +202,9 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                         FileReader r = genre == Genre.PLAIN
                                 ? new FileReader(new File(sh.sourceRoot, rpath))
                                 : null;
+                        boolean isDefSearch = (sh.builder.getDefs() != null) ? true : false;
                         sh.sourceContext.getContext(r, out, xrefPrefix,
-                                morePrefix, rpath, tags, true, null);
+                                morePrefix, rpath, tags, true, isDefSearch, null);
                     }
                 }
                 if (sh.historyContext != null) {

src/org/opensolaris/opengrok/search/context/Context.java

@@ -127,7 +127,7 @@ private void buildQueryAsURI(Map<String, String> subqueries) {
      */
     public boolean getContext(Reader in, Writer out, String urlPrefix,
             String morePrefix, String path, Definitions tags,
-            boolean limit, List<Hit> hits) {
+            boolean limit, boolean isDefSearch, List<Hit> hits) {
         alt = !alt;
         if (m == null) {
             IOUtils.close(in);
@@ -250,7 +250,9 @@ public boolean getContext(Reader in, Writer out, String urlPrefix,
                 for (int i = 0; i < m.length; i++) {
                     matchState = m[i].match(token);
                     if (matchState == LineMatcher.MATCHED) {
-                        tokens.printContext();
+                        if (!isDefSearch) {
+                            tokens.printContext();
+                        }
                         matchedLines++;
                         //out.write("<br> <i>Matched " + token + " maxlines = " + matchedLines + "</i><br>");
                         break;

web/more.jsp

@@ -50,7 +50,7 @@ file="mast.jsp"
     <pre><%
             sourceContext.getContext(new FileReader(cfg.getResourceFile()), out,
                 request.getContextPath() + Prefix.XREF_P, null, cfg.getPath(),
-                null, false, null);
+                null, false, false, null);
     %></pre>
 </div><%
         }