From bf834bcac668fd2911c26ef2cf615d974a362bda Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 30 Sep 2010 19:20:56 +0000 Subject: [PATCH] Merge r5988 from nihvivo-rel-1.1-maint --- .../search/controller/AutocompleteController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java index 4afc67a54..f2d23df17 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java @@ -288,9 +288,13 @@ public class AutocompleteController extends BaseSearchController implements Sear Query query = parser.parse(querystr); boolQuery.add(query, BooleanClause.Occur.SHOULD); - log.debug("Adding wildcard query for " + querystr); - Query wildcardQuery = parser.parse(querystr + "*"); - boolQuery.add(wildcardQuery, BooleanClause.Occur.SHOULD); + // Prevent ParseException here when adding * after a space. + // If there's a space at the end, we don't need the wildcard query. + if (! querystr.endsWith(" ")) { + log.debug("Adding wildcard query for " + querystr); + Query wildcardQuery = parser.parse(querystr + "*"); + boolQuery.add(wildcardQuery, BooleanClause.Occur.SHOULD); + } log.debug("Name query is: " + boolQuery.toString()); } catch (ParseException e) {