Store numlines if Xref is used while analyzing

Author: idodeclare

src/org/opensolaris/opengrok/analysis/FileAnalyzer.java

@@ -33,10 +33,12 @@
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
+import org.apache.lucene.document.StoredField;
 import org.opensolaris.opengrok.analysis.plain.PlainFullTokenizer;
 import org.opensolaris.opengrok.analysis.plain.PlainSymbolTokenizer;
 import org.opensolaris.opengrok.configuration.Project;
 import org.opensolaris.opengrok.logger.LoggerFactory;
+import org.opensolaris.opengrok.search.QueryBuilder;
 
 /**
  * Base class for all different File Analyzers
@@ -245,6 +247,15 @@ protected TokenStreamComponents createComponents(String fieldName) {
         }
     }
 
+    /**
+     * Add a field to store document number of lines.
+     * @param doc the target document
+     * @param value the number of lines
+     */
+    protected void addNumLines(Document doc, int value)  {
+        doc.add(new StoredField(QueryBuilder.NUML, value));
+    }
+
     private JFlexTokenizer createPlainSymbolTokenizer() {
         return new JFlexTokenizer(new PlainSymbolTokenizer(
             FileAnalyzer.dummyReader));

src/org/opensolaris/opengrok/analysis/Xrefer.java

@@ -41,6 +41,12 @@ public interface Xrefer extends Resettable {
      */
     Scopes getScopes();
 
+    /**
+     * Gets the document number of lines.
+     * @return a number greater than or equal to 1
+     */
+    int getLineNumber();
+
     void setAnnotation(Annotation annotation);
 
     /**

src/org/opensolaris/opengrok/analysis/document/MandocAnalyzer.java

@@ -65,7 +65,9 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
             try (Reader in = getReader(src.getStream())) {
                 WriteXrefArgs args = new WriteXrefArgs(in, xrefOut);
                 args.setProject(project);
-                writeXref(args);
+                Xrefer xref = writeXref(args);
+
+                addNumLines(doc, xref.getLineNumber());
             }
         }
     }

src/org/opensolaris/opengrok/analysis/document/MandocXref.lex

@@ -76,7 +76,9 @@ import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
         didStartTee = true;
     }
 
-    protected void writeTee(String s) throws IOException {
+    protected void writeTee() throws IOException {
+        if (!didStartTee) startTee();
+        String s = yytext();
         plainbuf.write(s);
         if (didStartMandoc) mandoc.write(s);
     }
@@ -116,11 +118,17 @@ import org.opensolaris.opengrok.configuration.RuntimeEnvironment;
     plainbuf = null;
 %eof}
 
+%include Common.lexh
 %%
 <YYINITIAL> {
+    {EOL}    {
+        writeTee();
+        setLineNumber(++yyline);
+    }
+
+    {WhiteSpace} |
     \w+ |
     [^]    {
-        if (!didStartTee) startTee();
-        writeTee(yytext());
+        writeTee();
     }
 }

src/org/opensolaris/opengrok/analysis/document/TroffAnalyzer.java

@@ -65,7 +65,9 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut) throws IOExc
             try (Reader in = getReader(src.getStream())) {
                 WriteXrefArgs args = new WriteXrefArgs(in, xrefOut);
                 args.setProject(project);
-                writeXref(args);
+                Xrefer xref = writeXref(args);
+
+                addNumLines(doc, xref.getLineNumber());
             }
         }
     }

src/org/opensolaris/opengrok/analysis/plain/PlainAnalyzer.java

@@ -127,6 +127,8 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
                     doc.add(new StoredField(QueryBuilder.SCOPES,
                         scopesSerialized));
                 }
+
+                addNumLines(doc, xref.getLineNumber());
             }
         }
     }

src/org/opensolaris/opengrok/analysis/plain/XMLAnalyzer.java

@@ -33,6 +33,7 @@
 import org.opensolaris.opengrok.analysis.StreamSource;
 import org.opensolaris.opengrok.analysis.TextAnalyzer;
 import org.opensolaris.opengrok.analysis.WriteXrefArgs;
+import org.opensolaris.opengrok.analysis.Xrefer;
 
 /**
  * Analyzes HTML files Created on September 30, 2005
@@ -57,7 +58,9 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut) throws IOExc
             try (Reader in = getReader(src.getStream())) {
                 WriteXrefArgs args = new WriteXrefArgs(in, xrefOut);
                 args.setProject(project);
-                writeXref(args);
+                Xrefer xref = writeXref(args);
+
+                addNumLines(doc, xref.getLineNumber());
             }
         }
     }

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

@@ -20,6 +20,7 @@
 /* 
  * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Jens Elkner.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.search;
 
@@ -49,6 +50,7 @@ public class QueryBuilder {
     public static final String HIST = "hist";
     public static final String TYPE = "type";
     public static final String SCOPES = "scopes";
+    public static final String NUML = "numl";
     /**
      * Fields we use in lucene internal ones
      */