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

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

Revision: 1090
          http://treebase.svn.sourceforge.net/treebase/?rev=1090&view=rev
Author:   rvos
Date:     2012-02-23 19:07:30 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Actually, we should probably check if query is an empty string (but not null).

Modified Paths:
--------------
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java
    trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java	2012-02-23 18:59:11 UTC (rev 1089)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java	2012-02-23 19:07:30 UTC (rev 1090)
@@ -59,7 +59,7 @@
 		LOGGER.info("in matrixSearchController.onSubmit");
 		clearMessages(req);
 		String query = req.getParameter("query");
-		if ( null != query ) {
+		if ( ! TreebaseUtil.isEmpty(query) ) {
 			return handleQueryRequest(req, res, err, query);
 		}
 		else {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2012-02-23 18:59:11 UTC (rev 1089)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2012-02-23 19:07:30 UTC (rev 1090)
@@ -97,7 +97,7 @@
 		LOGGER.info("in StudySearchController.onSubmit");
 		clearMessages(req);
 		String query = req.getParameter("query");
-		if ( null != query ) {
+		if ( ! TreebaseUtil.isEmpty(query) ) {
 			return handleQueryRequest(req, res, err, query);
 		}
 		else {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java	2012-02-23 18:59:11 UTC (rev 1089)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java	2012-02-23 19:07:30 UTC (rev 1090)
@@ -50,7 +50,7 @@
 	protected ModelAndView onSubmit(HttpServletRequest req, HttpServletResponse res, Object comm, BindException err) throws Exception {
 		clearMessages(req);
 		String query = req.getParameter("query");
-		if ( null != query ) {
+		if ( ! TreebaseUtil.isEmpty(query) ) {
 			return handleQueryRequest(req, res, err, query);
 		}
 		else {

Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java	2012-02-23 18:59:11 UTC (rev 1089)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java	2012-02-23 19:07:30 UTC (rev 1090)
@@ -58,7 +58,7 @@
 		LOGGER.info("in TreeSearchController.onSubmit");
 		clearMessages(req);
 		String query = req.getParameter("query");
-		if ( null != query ) {
+		if ( ! TreebaseUtil.isEmpty(query) ) {
 			return handleQueryRequest(req, res, err, query);
 		}
 		else {

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