Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[844] trunk/treebase-web/src/main/java/org/cipres/ treebase/web/controllers/StudySearchController.java
|
From: <rv...@us...> - 2011-05-12 12:14:01
|
Revision: 844
http://treebase.svn.sourceforge.net/treebase/?rev=844&view=rev
Author: rvos
Date: 2011-05-12 12:13:55 +0000 (Thu, 12 May 2011)
Log Message:
-----------
The submission creation date (prism.creationDate), study last modification date (tb.lastModifiedDate) and the citation publication date (prism.publicationDate) can now also be used as search predicates. A query must be phrased either as before, i.e. <index> < <date>, or after, i.e. <index> > <date>. The date string must be parseable using DateFormat.parse(s).
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-05-12 12:09:30 UTC (rev 843)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2011-05-12 12:13:55 UTC (rev 844)
@@ -2,7 +2,9 @@
package org.cipres.treebase.web.controllers;
import java.io.IOException;
+import java.text.ParseException;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -20,6 +22,8 @@
import org.cipres.treebase.domain.search.StudySearchResults;
import org.cipres.treebase.domain.study.Study;
import org.cipres.treebase.domain.study.StudyService;
+import org.cipres.treebase.domain.study.Submission;
+import org.cipres.treebase.domain.study.SubmissionService;
import org.cipres.treebase.web.Constants;
import org.cipres.treebase.web.util.RequestMessageSetter;
import org.springframework.validation.BindException;
@@ -31,8 +35,11 @@
import org.z3950.zing.cql.CQLOrNode;
import org.z3950.zing.cql.CQLParseException;
import org.z3950.zing.cql.CQLParser;
+import org.z3950.zing.cql.CQLRelation;
import org.z3950.zing.cql.CQLTermNode;
+import com.ibm.icu.text.DateFormat;
+
/**
* StudySearchController.java
*
@@ -78,7 +85,11 @@
byLegacyID,
byTitle,
byKeyword,
- byJournal
+ byJournal,
+ byCreationDate,
+ byPublicationDate,
+ byReleaseDate,
+ byLastModifiedDate
}
protected ModelAndView onSubmit(
@@ -132,7 +143,7 @@
}
// XXX we now never do an exact match with terms provided through the web app. We can change
// this, e.g. by adding a check box whose value is the boolean argument of doSearch()
- Collection<Study> matches = doSearch(request, response, searchType, errors,searchTerm,false);
+ Collection<Study> matches = doSearch(request, response, searchType, errors,searchTerm,false,null);
if ( TreebaseUtil.isEmpty(request.getParameter("format")) || ! request.getParameter("format").equals("rss1") ) {
SearchResults<Study> newRes = intersectSearchResults(oldRes, new StudySearchResults(matches),
new RequestMessageSetter(request), "No matching studies found");
@@ -154,7 +165,7 @@
HttpServletRequest request,
HttpServletResponse response,
BindException errors
- ) throws InstantiationException {
+ ) throws InstantiationException, ParseException {
if ( node instanceof CQLBooleanNode ) {
Set<Study> resultsLeft = doCQLQuery(((CQLBooleanNode)node).left,results, request, response, errors);
Set<Study> resultsRight = doCQLQuery(((CQLBooleanNode)node).right,results, request, response, errors);
@@ -182,23 +193,32 @@
else if ( node instanceof CQLTermNode ) {
CQLTermNode term = (CQLTermNode)node;
boolean exactMatch = term.getRelation().getBase().equals("==");
+ CQLRelation relation = term.getRelation();
String index = term.getIndex();
if ( index.startsWith("tb.title") ) {
- results.addAll(doSearch(request, response, SearchType.byTitle, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byTitle, errors, term.getTerm(),exactMatch,relation));
} else if ( index.equals("tb.identifier.study") ) {
- results.addAll(doSearch(request, response, SearchType.byID, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byID, errors, term.getTerm(),exactMatch,relation));
} else if ( index.startsWith("dcterms.contributor") ) {
- results.addAll(doSearch(request, response, SearchType.byAuthorName, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byAuthorName, errors, term.getTerm(),exactMatch,relation));
} else if ( index.startsWith("dcterms.abstract") ) {
- results.addAll(doSearch(request, response, SearchType.inAbstract, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.inAbstract, errors, term.getTerm(),exactMatch,relation));
} else if ( index.startsWith("dcterms.subject") ) {
- results.addAll(doSearch(request, response, SearchType.byKeyword, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byKeyword, errors, term.getTerm(),exactMatch,relation));
} else if ( index.startsWith("dcterms.bibliographicCitation") ) {
- results.addAll(doSearch(request, response, SearchType.inCitation, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.inCitation, errors, term.getTerm(),exactMatch,relation));
} else if ( index.equals("tb.identifier.study.tb1") ) {
- results.addAll(doSearch(request, response, SearchType.byLegacyID, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byLegacyID, errors, term.getTerm(),exactMatch,relation));
} else if ( index.startsWith("prism.publicationName") ) {
- results.addAll(doSearch(request, response, SearchType.byJournal, errors, term.getTerm(),exactMatch));
+ results.addAll(doSearch(request, response, SearchType.byJournal, errors, term.getTerm(),exactMatch,relation));
+ } else if ( index.startsWith("dc.date") ) {
+ results.addAll(doSearch(request,response, SearchType.byReleaseDate, errors, term.getTerm(),exactMatch,relation));
+ } else if ( index.startsWith("prism.creationDate") ) {
+ results.addAll(doSearch(request,response, SearchType.byCreationDate, errors, term.getTerm(),exactMatch,relation));
+ } else if ( index.startsWith("prism.publicationDate") ) {
+ results.addAll(doSearch(request,response, SearchType.byPublicationDate, errors, term.getTerm(),exactMatch,relation));
+ } else if ( index.startsWith("tb.lastModifiedDate") ) {
+ results.addAll(doSearch(request,response, SearchType.byLastModifiedDate, errors, term.getTerm(),exactMatch,relation));
} else {
// issue warnings
addMessage(request, "Unsupported index: " + index);
@@ -215,11 +235,12 @@
SearchType searchType,
BindException errors,
String searchTerm,
- boolean exactMatch) throws InstantiationException {
+ boolean exactMatch, CQLRelation relation) throws InstantiationException, ParseException {
String keywordSearchTerm = "%" + searchTerm + "%";
Collection<Study> matches;
- StudyService studyService = getSearchService().getStudyService();
+ StudyService studyService = getSearchService().getStudyService();
+ SubmissionService submissionService = getSearchService().getSubmissionService();
switch (searchType) {
case byID:
@@ -257,6 +278,15 @@
case byKeyword:
matches = studyService.findByKeyword(keywordSearchTerm);
break;
+ case byLastModifiedDate:
+ matches = findByLastModified(searchTerm, relation, submissionService);
+ break;
+ case byPublicationDate:
+ matches = findByPublicationDate(searchTerm, relation, studyService);
+ break;
+ case byCreationDate:
+ matches = findByCreationDate(searchTerm, relation, submissionService);
+ break;
case byJournal:
{
if ( exactMatch ) {
@@ -273,6 +303,67 @@
return matches;
}
+ private Collection<Study> findByCreationDate(String searchTerm,
+ CQLRelation relation, SubmissionService submissionService) throws ParseException {
+ Collection<Study> matches;
+ Date from = null;
+ Date until = null;
+ DateFormat df = DateFormat.getDateInstance();
+ if ( relation.getBase().startsWith(">") ) {
+ from = df.parse(searchTerm);
+ until = new Date(); // i.e. now
+ }
+ else if ( relation.getBase().startsWith("<") ) {
+ from = new Date(0); // i.e. epoch
+ until = df.parse(searchTerm);
+ }
+ Collection<Submission> submissions = submissionService.findSubmissionByCreateDateRange(from, until);
+ matches = new HashSet<Study>();
+ for ( Submission submission : submissions ) {
+ matches.add(submission.getStudy());
+ }
+ return matches;
+ }
+
+ private Collection<Study> findByPublicationDate(String searchTerm,
+ CQLRelation relation, StudyService studyService) throws ParseException {
+ Date from = null;
+ Date until = null;
+ DateFormat df = DateFormat.getDateInstance();
+ if ( relation.getBase().startsWith(">") ) {
+ from = df.parse(searchTerm);
+ until = new Date(); // i.e. now
+ }
+ else if ( relation.getBase().startsWith("<") ) {
+ from = new Date(0); // i.e. epoch
+ until = df.parse(searchTerm);
+ }
+ return studyService.findByPublicationDateRange(from, until);
+ }
+
+ private Collection<Study> findByLastModified(String searchTerm,
+ CQLRelation relation, SubmissionService submissionService)
+ throws ParseException {
+ Collection<Study> matches;
+ Date from = null;
+ Date until = null;
+ DateFormat df = DateFormat.getDateInstance();
+ if ( relation.getBase().startsWith(">") ) {
+ from = df.parse(searchTerm);
+ until = new Date(); // i.e. now
+ }
+ else if ( relation.getBase().startsWith("<") ) {
+ from = new Date(0); // i.e. epoch
+ until = df.parse(searchTerm);
+ }
+ Collection<Submission> submissions = submissionService.findSubmissionByLastModifiedDateRange(from, until);
+ matches = new HashSet<Study>();
+ for ( Submission submission : submissions ) {
+ matches.add(submission.getStudy());
+ }
+ return matches;
+ }
+
@Override
SearchResultsType currentSearchType() {
return SearchResultsType.STUDY;
@@ -286,7 +377,7 @@
@Override
protected ModelAndView handleQueryRequest(HttpServletRequest request,
HttpServletResponse response, BindException errors,String query)
- throws CQLParseException, IOException, InstantiationException {
+ throws CQLParseException, IOException, InstantiationException, ParseException {
//String query = request.getParameter("query");
CQLParser parser = new CQLParser();
CQLNode root = parser.parse(query);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
