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

[<hs...@us...>]

Revision: 964
          http://treebase.svn.sourceforge.net/treebase/?rev=964&view=rev
Author:   hshyket
Date:     2011-09-26 12:57:11 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
Fixing API query calls with no format

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	2011-09-23 17:15:15 UTC (rev 963)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2011-09-26 12:57:11 UTC (rev 964)
@@ -395,10 +395,8 @@
 		root = normalizeParseTree(root);
 		Set<Study> queryResults = doCQLQuery(root, new HashSet<Study>(),request, response, errors);
 		StudySearchResults tsr = new StudySearchResults(queryResults);
-		if (! request.getParameter("format").equals("rss1")) {
+		if ( TreebaseUtil.isEmpty(request.getParameter("format")) || ! request.getParameter("format").equals("rss1") ) {
 			saveSearchResults(request, tsr);
-		}
-		if ( TreebaseUtil.isEmpty(request.getParameter("format")) || ! request.getParameter("format").equals("rss1") ) {			
 			return new ModelAndView("search/studySearch", Constants.RESULT_SET, tsr);
 		}
 		else {

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