You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2013/05/04 09:44:39 UTC
svn commit: r1479055 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/search/LuceneQParser.java
core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
Author: janhoy
Date: Sat May 4 07:44:39 2013
New Revision: 1479055
URL: http://svn.apache.org/r1479055
Log:
SOLR-4784: Make class LuceneQParser public
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParser.java (with props)
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1479055&r1=1479054&r2=1479055&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat May 4 07:44:39 2013
@@ -108,6 +108,8 @@ Other Changes
* SOLR-4778: LogWatcher init code moved out of CoreContainer (Alan Woodward)
+* SOLR-4784: Make class LuceneQParser public (janhoy)
+
================== 4.3.0 ==================
Versions of Major Components
Added: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParser.java?rev=1479055&view=auto
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParser.java (added)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParser.java Sat May 4 07:44:39 2013
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.search;
+
+import org.apache.lucene.search.Query;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.request.SolrQueryRequest;
+
+/**
+ * @see LuceneQParserPlugin
+ */
+public class LuceneQParser extends QParser {
+ SolrQueryParser lparser;
+
+ public LuceneQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
+ super(qstr, localParams, params, req);
+ }
+
+
+ @Override
+ public Query parse() throws SyntaxError {
+ String qstr = getString();
+ if (qstr == null || qstr.length()==0) return null;
+
+ String defaultField = getParam(CommonParams.DF);
+ if (defaultField==null) {
+ defaultField = getReq().getSchema().getDefaultSearchFieldName();
+ }
+ lparser = new SolrQueryParser(this, defaultField);
+
+ lparser.setDefaultOperator
+ (QueryParsing.getQueryParserDefaultOperator(getReq().getSchema(),
+ getParam(QueryParsing.OP)));
+
+ return lparser.parse(qstr);
+ }
+
+
+ @Override
+ public String[] getDefaultHighlightFields() {
+ return lparser == null ? new String[]{} : new String[]{lparser.getDefaultField()};
+ }
+
+}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=1479055&r1=1479054&r2=1479055&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java Sat May 4 07:44:39 2013
@@ -46,40 +46,6 @@ public class LuceneQParserPlugin extends
}
}
-class LuceneQParser extends QParser {
- SolrQueryParser lparser;
-
- public LuceneQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
- super(qstr, localParams, params, req);
- }
-
-
- @Override
- public Query parse() throws SyntaxError {
- String qstr = getString();
- if (qstr == null || qstr.length()==0) return null;
-
- String defaultField = getParam(CommonParams.DF);
- if (defaultField==null) {
- defaultField = getReq().getSchema().getDefaultSearchFieldName();
- }
- lparser = new SolrQueryParser(this, defaultField);
-
- lparser.setDefaultOperator
- (QueryParsing.getQueryParserDefaultOperator(getReq().getSchema(),
- getParam(QueryParsing.OP)));
-
- return lparser.parse(qstr);
- }
-
-
- @Override
- public String[] getDefaultHighlightFields() {
- return lparser == null ? new String[]{} : new String[]{lparser.getDefaultField()};
- }
-
-}
-
class OldLuceneQParser extends LuceneQParser {
String sortStr;