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

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

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

Log Message:
-----------
Don't handle empty CQL queries.

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

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	2009-11-17 16:08:08 UTC (rev 272)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2009-11-17 16:21:50 UTC (rev 273)
@@ -93,21 +93,7 @@
 		
 		LOGGER.info("formName is '" + formName + "'");
 		
-		if ( ! TreebaseUtil.isEmpty(query) ) {
-			/*
-			CQLParser parser = new CQLParser();
-			CQLNode root = parser.parse(query);
-			root = normalizeParseTree(root);
-			Set<Study> queryResults = doCQLQuery(root, new HashSet<Study>(),request, response, errors);
-			StudySearchResults tsr = new StudySearchResults(queryResults);
-			saveSearchResults(request, tsr);
-			if ( TreebaseUtil.isEmpty(request.getParameter("format")) || ! request.getParameter("format").equals("rss1") ) {			
-				return new ModelAndView("search/studySearch", Constants.RESULT_SET, tsr);
-			}
-			else {
-				return this.searchResultsAsRDF(tsr, request, root);
-			}
-			*/
+		if ( ! TreebaseUtil.isEmpty(query) && ! query.equals("")) {
 			return this.handleQueryRequest(request, response, errors);
 		}		
 		


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