Added a new field “fileType” to the Lucene index.

The field should contain the file type. By default
the normalized name of the analyzer is used.

For example: “CAnalyzer” becomes “c” and
“SQLAnalyzer” becomes “sql”.

Author: svenpilz

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

@@ -278,6 +278,9 @@ public void populateDocument(Document doc, File file, String path,
                     ));
             }                   
             fa.analyze(doc, StreamSource.fromFile(file), xrefOut);
+            
+            String fileType = fa.getFileTypeName();
+            doc.add(new StringField(QueryBuilder.FILETYPE, fileType, Store.YES));
         }
     }
 

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

@@ -129,6 +129,23 @@ public FileAnalyzer(FileAnalyzerFactory factory) {
         this.factory = factory;        
 
     }
+    
+    /**
+     * Returns the normalized name of the analyzer,
+     * which should corresponds to the file type.
+     * Example: The analyzer for the C language (CAnalyzer) would return “c”.
+     * @return Normalized name of the analyzer.
+     */
+    public String getFileTypeName() {
+        String name = this.getClass().getSimpleName().toLowerCase();
+        String suffix = "analyzer";
+        
+        if (name.endsWith(suffix)) {
+            return name.substring(0, name.length() - suffix.length());
+        }
+        
+        return name.toLowerCase();
+    }
 
     /**
      * Analyze the contents of a source file. This includes populating the

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

@@ -49,6 +49,7 @@ public class QueryBuilder {
     public static final String REFS = "refs";
     public static final String PATH = "path";
     public static final String HIST = "hist";
+    public static final String FILETYPE = "fileType";
     /**
      * Fields we use in lucene internal ones
      */
@@ -160,6 +161,25 @@ public QueryBuilder setHist(String hist) {
     public String getHist() {
         return getQueryText(HIST);
     }
+    
+    /**
+     * Set search string for the "fileType" field.
+     *
+     * @param fileType query string to set
+     * @return this instance
+     */
+    public QueryBuilder setFileType(String fileType) {
+        return addQueryText(FILETYPE, fileType);
+    }
+
+    /**
+     * Get search string for the "fileType" field.
+     *
+     * @return {@code null} if not set, the query string otherwise.
+     */
+    public String getFileType() {
+        return getQueryText(FILETYPE);
+    }
 
     /**
      * Get a map containing the query text for each of the fields that have been

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

@@ -36,13 +36,14 @@
 @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.SystemPrintln"})
 final class Search {
 
-    private static final String usage = "USAGE: Search -R <configuration.xml> [-d | -r | -p | -h | -f] 'query string' ..\n" +
+    private static final String usage = "USAGE: Search -R <configuration.xml> [-d | -r | -p | -h | -f | -t] 'query string' ..\n" +
             "\t -R <configuration.xml> Read configuration from the specified file\n" +
             "\t -d Symbol Definitions\n" +
             "\t -r Symbol References\n" +
             "\t -p Path\n" +
             "\t -h History\n" +
-            "\t -f Full text";
+            "\t -f Full text\n" +
+            "\t -t File Type";
 
     private SearchEngine engine;
     final List<Hit> results = new ArrayList<Hit>();
@@ -52,7 +53,7 @@ final class Search {
     @SuppressWarnings({"PMD.SwitchStmtsShouldHaveDefault"})
     protected boolean parseCmdLine(String[] argv) {
         engine = new SearchEngine();
-        Getopt getopt = new Getopt(argv, "R:d:r:p:h:f:");
+        Getopt getopt = new Getopt(argv, "R:d:r:p:h:f:t:");
         try {
             getopt.parse();
         } catch (Exception e) {
@@ -88,6 +89,9 @@ protected boolean parseCmdLine(String[] argv) {
                 case 'f':
                     engine.setFreetext(getopt.getOptarg());
                     break;
+                case 't':
+                    engine.setFileType(getopt.getOptarg());
+                    break;
             }
         }
 

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

@@ -95,6 +95,10 @@ public class SearchEngine {
      * Holds value of property symbol.
      */
     private String symbol;
+    /**
+     * Holds value of property fileType
+     */
+    private String fileType;
     /**
      * Holds value of property indexDatabase.
      */
@@ -136,7 +140,8 @@ private QueryBuilder createQueryBuilder() {
                 .setDefs(definition)
                 .setRefs(symbol)
                 .setPath(file)
-                .setHist(history);
+                .setHist(history)
+                .setFileType(fileType);
     }
 
     public boolean isValidQuery() {
@@ -488,4 +493,22 @@ public String getSymbol() {
     public void setSymbol(String symbol) {
         this.symbol = symbol;
     }
+    
+    /**
+     * Getter for property fileType.
+     *
+     * @return Value of property fileType.
+     */
+    public String getFileType() {
+        return this.fileType;
+    }
+
+    /**
+     * Setter for property fileType.
+     *
+     * @param fileType New value of property fileType.
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
 }