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

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

Revision: 559
          http://treebase.svn.sourceforge.net/treebase/?rev=559&view=rev
Author:   rvos
Date:     2010-03-12 23:25:12 +0000 (Fri, 12 Mar 2010)

Log Message:
-----------
Added mapping from CQL search predicate prism.publicationName to Study.findByJournal functionality.

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	2010-03-12 23:23:11 UTC (rev 558)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java	2010-03-12 23:25:12 UTC (rev 559)
@@ -77,6 +77,7 @@
 		byLegacyID,
 		byTitle,
 		byKeyword,
+		byJournal
 	}
 
 	protected ModelAndView onSubmit(
@@ -191,6 +192,8 @@
 				results.addAll(doSearch(request, response, SearchType.inCitation, errors, term.getTerm()));				
 			} else if ( index.equals("tb.identifier.study.tb1") ) {
 				results.addAll(doSearch(request, response, SearchType.byLegacyID, errors, term.getTerm()));
+			} else if ( index.startsWith("prism.publicationName") ) {
+				results.addAll(doSearch(request, response, SearchType.byJournal, errors, term.getTerm()));
 			} else {
 				// issue warnings
 				addMessage(request, "Unsupported index: " + index);
@@ -279,6 +282,9 @@
 			case byKeyword:
 				matches = studyService.findByKeyword(keywordSearchTerm);
 				break;
+			case byJournal:
+				matches = studyService.findByJournal(keywordSearchTerm, false);
+				break;
 			default:
 				throw new Error ("Unknown search type '" + searchType + "'");
 		}


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