SOLR-6103: Add QParser arg to AbstractSpatialFieldType.parseSpatialArgs(). Make getQueryFromSpatialArgs protected no private.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1600556 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2014-06-05 02:04:36 +00:00
parent bb267a143e
commit 1e24c0218f
1 changed files with 3 additions and 3 deletions

View File

@ -251,10 +251,10 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
@Override
public Query getFieldQuery(QParser parser, SchemaField field, String externalVal) {
return getQueryFromSpatialArgs(parser, field, parseSpatialArgs(externalVal));
return getQueryFromSpatialArgs(parser, field, parseSpatialArgs(parser, externalVal));
}
protected SpatialArgs parseSpatialArgs(String externalVal) {
protected SpatialArgs parseSpatialArgs(QParser parser, String externalVal) {
try {
return argsParser.parse(externalVal, ctx);
} catch (SolrException e) {
@ -264,7 +264,7 @@ public abstract class AbstractSpatialFieldType<T extends SpatialStrategy> extend
}
}
private Query getQueryFromSpatialArgs(QParser parser, SchemaField field, SpatialArgs spatialArgs) {
protected Query getQueryFromSpatialArgs(QParser parser, SchemaField field, SpatialArgs spatialArgs) {
T strategy = getStrategy(field.getName());
SolrParams localParams = parser.getLocalParams();