[Treebase-guts] SF.net SVN: treebase:[275] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/SearchController.java

[<rv...@us...>]

Revision: 275
          http://treebase.svn.sourceforge.net/treebase/?rev=275&view=rev
Author:   rvos
Date:     2009-11-17 16:55:09 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
Added test to skip over not just query variables that are null, but also those that are "empty", as per TreebaseUtil.isEmpty(query), i.e. those that are strings such as "", which can happen when the $QUERY_STRING is reconstituted automatically and appended to the current URL.

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java	2009-11-17 16:47:32 UTC (rev 274)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SearchController.java	2009-11-17 16:55:09 UTC (rev 275)
@@ -19,6 +19,7 @@
 
 import org.apache.log4j.Logger;
 import org.cipres.treebase.TreebaseIDString;
+import org.cipres.treebase.TreebaseUtil;
 import org.cipres.treebase.TreebaseIDString.MalformedTreebaseIDString;
 import org.cipres.treebase.domain.TBPersistable;
 import org.cipres.treebase.domain.search.SearchResults;
@@ -396,7 +397,8 @@
 			HttpServletResponse response, BindException bindException, Map model)
 			throws Exception {
 		String query = request.getParameter("query");
-		if ( query != null ) {
+		if ( query != null && ! TreebaseUtil.isEmpty(query) ) {
+			LOGGER.info("query is '"+ query +"'");
 			return this.handleQueryRequest(request, response, bindException);
 		}
 		String action = request.getParameter("action");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.