svn commit: r392732 - in /incubator/solr/trunk/src/java/org/apache/solr: request/StandardRequestHandler.java search/QueryParsing.java search/SolrQueryParser.java

[eh...@apache.org]

Author: ehatcher
Date: Sun Apr  9 07:05:01 2006
New Revision: 392732

URL: http://svn.apache.org/viewcvs?rev=392732&view=rev
Log:
Add default field capability via df query string parameter

Modified:
    incubator/solr/trunk/src/java/org/apache/solr/request/StandardRequestHandler.java
    incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
    incubator/solr/trunk/src/java/org/apache/solr/search/SolrQueryParser.java

Modified: incubator/solr/trunk/src/java/org/apache/solr/request/StandardRequestHandler.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/request/StandardRequestHandler.java?rev=392732&r1=392731&r2=392732&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/request/StandardRequestHandler.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/request/StandardRequestHandler.java Sun Apr  9 07:05:01 2006
@@ -64,6 +64,7 @@
     try {
       String sreq = req.getQueryString();
       String debug = req.getParam("debugQuery");
+      String defaultField = req.getParam("df");
 
       // find fieldnames to return (fieldlist)
       String fl = req.getParam("fl");
@@ -86,7 +87,7 @@
       List<String> commands = StrUtils.splitSmart(sreq,';');
 
       String qs = commands.size() >= 1 ? commands.get(0) : "";
-      Query query = QueryParsing.parseQuery(qs, req.getSchema());
+      Query query = QueryParsing.parseQuery(qs, defaultField, req.getSchema());
 
       // If the first non-query, non-filter command is a simple sort on an indexed field, then
       // we can use the Lucene sort ability.

Modified: incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java?rev=392732&r1=392731&r2=392732&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/QueryParsing.java Sun Apr  9 07:05:01 2006
@@ -39,8 +39,12 @@
 public class QueryParsing {
 
   public static Query parseQuery(String qs, IndexSchema schema) {
+    return parseQuery(qs, null, schema);
+  }
+
+  public static Query parseQuery(String qs, String defaultField, IndexSchema schema) {
     try {
-      Query query = new SolrQueryParser(schema).parse(qs);
+      Query query = new SolrQueryParser(schema, defaultField).parse(qs);
 
       if (SolrCore.log.isLoggable(Level.FINEST)) {
         SolrCore.log.finest("After QueryParser:" + query);

Modified: incubator/solr/trunk/src/java/org/apache/solr/search/SolrQueryParser.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/java/org/apache/solr/search/SolrQueryParser.java?rev=392732&r1=392731&r2=392732&view=diff
==============================================================================
--- incubator/solr/trunk/src/java/org/apache/solr/search/SolrQueryParser.java (original)
+++ incubator/solr/trunk/src/java/org/apache/solr/search/SolrQueryParser.java Sun Apr  9 07:05:01 2006
@@ -33,8 +33,8 @@
 public class SolrQueryParser extends QueryParser {
   protected final IndexSchema schema;
 
-  public SolrQueryParser(IndexSchema schema) {
-    super(schema.getDefaultSearchFieldName(), schema.getQueryAnalyzer());
+  public SolrQueryParser(IndexSchema schema, String defaultField) {
+    super(defaultField == null ? schema.getDefaultSearchFieldName() : defaultField, schema.getQueryAnalyzer());
     this.schema = schema;
     setLowercaseExpandedTerms(false);
   }