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

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

Revision: 957
          http://treebase.svn.sourceforge.net/treebase/?rev=957&view=rev
Author:   hshyket
Date:     2011-09-15 17:30:52 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
Updating it so that any data provided in RSS format is not saved in the memory search results.

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-15 15:50:53 UTC (rev 956)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2011-09-15 17:30:52 UTC (rev 957)
@@ -395,7 +395,9 @@
 		root = normalizeParseTree(root);
 		Set<Study> queryResults = doCQLQuery(root, new HashSet<Study>(),request, response, errors);
 		StudySearchResults tsr = new StudySearchResults(queryResults);
-		saveSearchResults(request, tsr);
+		if (! 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);
 		}
@@ -414,7 +416,9 @@
 					res = tsr.convertToTaxa();
 				}
 			}
-			this.saveSearchResults(request, res);
+			if (! request.getParameter("format").equals("rss1")) {
+				this.saveSearchResults(request, res);
+			}
 			return this.searchResultsAsRDF(res, request, root, schema, "study");
 		}		
 	}

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