Mercurial Hosting > luan
diff src/luan/modules/lucene/queryparser/MultiFieldParser.java @ 1110:38a42f437fd2
queryparser now uses parsers.Parser
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Wed, 02 Aug 2017 13:45:06 -0600 |
parents | 1a68fc55a80c |
children | 88b5b81cad4a |
line wrap: on
line diff
--- a/src/luan/modules/lucene/queryparser/MultiFieldParser.java Wed Aug 02 12:36:28 2017 -0600 +++ b/src/luan/modules/lucene/queryparser/MultiFieldParser.java Wed Aug 02 13:45:06 2017 -0600 @@ -6,6 +6,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.SortField; +import luan.modules.parsers.ParseException; public class MultiFieldParser implements FieldParser { @@ -34,7 +35,7 @@ @Override public Query getQuery(SaneQueryParser qp,String field,String query) throws ParseException { if( field == null ) { if( defaultFieldParser == null ) - throw new ParseException(qp,"no defaults were specified, so a field is required"); + throw qp.exception("no defaults were specified, so a field is required"); if( defaultFields.length == 1 ) return defaultFieldParser.getQuery(qp,defaultFields[0],query); BooleanQuery bq = new BooleanQuery(); @@ -48,14 +49,14 @@ return fp.getQuery(qp,field,query); if( allowUnspecifiedFields ) return defaultFieldParser.getQuery(qp,field,query); - throw new ParseException(qp,"unrecognized field '"+field+"'"); + throw qp.exception("unrecognized field '"+field+"'"); } } @Override public Query getRangeQuery(SaneQueryParser qp,String field,String minQuery,String maxQuery,boolean includeMin,boolean includeMax) throws ParseException { if( field == null ) { if( defaultFieldParser == null ) - throw new ParseException(qp,"no defaults were specified, so a field is required"); + throw qp.exception("no defaults were specified, so a field is required"); if( defaultFields.length == 1 ) return defaultFieldParser.getRangeQuery(qp,defaultFields[0],minQuery,maxQuery,includeMin,includeMax); BooleanQuery bq = new BooleanQuery(); @@ -69,7 +70,7 @@ return fp.getRangeQuery(qp,field,minQuery,maxQuery,includeMin,includeMax); if( allowUnspecifiedFields ) return defaultFieldParser.getRangeQuery(qp,field,minQuery,maxQuery,includeMin,includeMax); - throw new ParseException(qp,"field '"+field+"' not specified"); + throw qp.exception("field '"+field+"' not specified"); } } @@ -79,7 +80,7 @@ return fp.getSortField(qp,field,reverse); if( allowUnspecifiedFields ) return defaultFieldParser.getSortField(qp,field,reverse); - throw new ParseException(qp,"field '"+field+"' not specified"); + throw qp.exception("field '"+field+"' not specified"); } }