mirror of https://github.com/apache/lucene.git
SOLR-4784: Make class LuceneQParser public
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1479055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
46dc9aa52c
commit
ec7317a8d6
|
@ -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
|
||||
|
|
|
@ -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()};
|
||||
}
|
||||
|
||||
}
|
|
@ -46,40 +46,6 @@ public class LuceneQParserPlugin extends QParserPlugin {
|
|||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue