litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rejecting empty search strings NIHVIVO-2906

Browse source
This commit is contained in:
briancaruso 2011-07-14 22:02:25 +00:00
parent 6108fcd61f
commit 2bca677b36
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -165,13 +165,16 @@ public class PagedSearchController extends FreemarkerHttpServlet {
int maxHitCount = DEFAULT_MAX_HIT_COUNT ; int maxHitCount = DEFAULT_MAX_HIT_COUNT ;
if( startIndex >= DEFAULT_MAX_HIT_COUNT - hitsPerPage ) if( startIndex >= DEFAULT_MAX_HIT_COUNT - hitsPerPage )
maxHitCount = startIndex + DEFAULT_MAX_HIT_COUNT ; maxHitCount = startIndex + DEFAULT_MAX_HIT_COUNT ;
log.debug("maxHitCount is " + maxHitCount); log.debug("maxHitCount is " + maxHitCount);
String qtxt = vreq.getParameter(VitroQuery.QUERY_PARAMETER_NAME); String qtxt = vreq.getParameter(VitroQuery.QUERY_PARAMETER_NAME);
log.debug("Query text is \""+ qtxt + "\""); log.debug("Query text is \""+ qtxt + "\"");
String badQueryMsg = badQueryText( qtxt );
if( badQueryMsg != null ){
return doFailedSearch(badQueryMsg, qtxt, format);
}
SolrQuery query = getQuery(qtxt, maxHitCount, vreq); SolrQuery query = getQuery(qtxt, maxHitCount, vreq);
SolrServer solr = SolrSetup.getSolrServer(getServletContext()); SolrServer solr = SolrSetup.getSolrServer(getServletContext());
QueryResponse response = null; QueryResponse response = null;
@ -331,6 +334,16 @@ public class PagedSearchController extends FreemarkerHttpServlet {
} }
private String badQueryText(String qtxt) {
if( qtxt == null || "".equals( qtxt.trim() ) )
return "Please enter a search term.";
if( qtxt.equals("*:*") )
return "Search term was invalid" ;
return null;
}
/** /**
* Get the class groups represented for the individuals in the documents. * Get the class groups represented for the individuals in the documents.
*/ */