You can subscribe to this list here.
2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
(14) |
May
(36) |
Jun
(148) |
Jul
(33) |
Aug
(2) |
Sep
(17) |
Oct
(42) |
Nov
(137) |
Dec
(88) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2010 |
Jan
(89) |
Feb
(80) |
Mar
(217) |
Apr
(76) |
May
(5) |
Jun
(39) |
Jul
(35) |
Aug
(4) |
Sep
(7) |
Oct
(14) |
Nov
(12) |
Dec
(9) |
2011 |
Jan
(6) |
Feb
(4) |
Mar
(11) |
Apr
(55) |
May
(90) |
Jun
(39) |
Jul
(15) |
Aug
(15) |
Sep
(23) |
Oct
(12) |
Nov
(17) |
Dec
(20) |
2012 |
Jan
(22) |
Feb
(63) |
Mar
|
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
(3) |
Feb
(6) |
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <sfr...@us...> - 2011-04-30 22:03:49
|
Revision: 824 http://treebase.svn.sourceforge.net/treebase/?rev=824&view=rev Author: sfrgpiel Date: 2011-04-30 22:03:40 +0000 (Sat, 30 Apr 2011) Log Message: ----------- Data Management Plan Verbiage Modified Paths: -------------- trunk/treebase-web/src/main/resources/ApplicationResources.properties trunk/treebase-web/src/main/webapp/WEB-INF/decorators.xml trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml Added Paths: ----------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/dataMan.jsp Modified: trunk/treebase-web/src/main/resources/ApplicationResources.properties =================================================================== --- trunk/treebase-web/src/main/resources/ApplicationResources.properties 2011-04-29 18:54:30 UTC (rev 823) +++ trunk/treebase-web/src/main/resources/ApplicationResources.properties 2011-04-30 22:03:40 UTC (rev 824) @@ -79,6 +79,7 @@ nav.search=Search nav.search.treebase=Search TreeBASE nav.submit=Submit +nav.dataman=NSF Data Management Plan nav.stats=Stats nav.referee=Referee nav.urlapi= URL API Modified: trunk/treebase-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/decorators.xml 2011-04-29 18:54:30 UTC (rev 823) +++ trunk/treebase-web/src/main/webapp/WEB-INF/decorators.xml 2011-04-30 22:03:40 UTC (rev 824) @@ -7,6 +7,7 @@ <!-- decoration page for the main opening page --> <decorator name="main" page="mainTemplate.jsp"> <pattern>/home.html</pattern> + <pattern>/dataMan.html</pattern> <pattern>/about.html</pattern> <pattern>/urlAPI.html</pattern> <pattern>/people.html</pattern> Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/dataMan.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/dataMan.jsp (rev 0) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/dataMan.jsp 2011-04-30 22:03:40 UTC (rev 824) @@ -0,0 +1,51 @@ +<%@page import="org.cipres.treebase.TreebaseUtil"%> +<% String purlBase = TreebaseUtil.getPurlBase(); %> + +<div class="gutter"> + +<h1>NSF Data Management Plan</h1> +<p>To foster the sharing and dissemination of data produced by sponsored research, the National Science Foundation requires a data management plan for all proposals. At a minimum, these data consist of whatever is necessary to validate research findings by the scientific community, which includes (1) analyzed data, and metadata that (2) provide provenance and (3) define how the data were generated. </p> +<h2>Data Ingest and Storage</h2> +<p>The three kinds of data required by NSF are accepted by TreeBASE, whether submitted directly to TreeBASE or indirectly by way of <a href="http://datadryad.org/" target="_blank">Dryad</a>. For (1), we accept NEXUS character block data with datatypes standard, continuous, DNA, RNA, and protein, and non-reticulating phylogenetic trees with branch lengths and clade support values. For (2) we parse and store character labels and state labels in submitted NEXUS files and we map taxon labels to NCBI and uBio external taxonomies. Additionally, we accept the following metadata: museum specimen numbers in accordance with the Registry of Biological Repositories (<a href="http://www.biorepositories.org" target="_blank">RBR</a>), Genbank accession numbers, other accession numbers, and Darwin Core compatible specimen metadata: collecting date, collector, latitude/longitude, elevation, country, state, and locality. For (3), we store and share the original uploaded NEXUS files (including any program-specific command blocks that can define substitution models and search parameters) as well as offer metadata files in analysis description records for annotating software, algorithm, and commands used. TreeBASE only shares data that are linked to a manuscript that is accepted by a peer reviewed publication (e.g. journal article, reviewed book or book section, academic thesis accepted by a thesis committee, etc). </p> +<h2>Data Integrity and Verification</h2> +<p>TreeBASE helps to certify data integrity by: (A) only accepting NEXUS data that are successfully parsed by a server-side headless version of <a href="http://mesquiteproject.org/" target="_blank">Mesquite</a>, (B) verifying that taxon labels in matrices and relevant trees are consistent, (C) verifying that data objects are not 'orphaned' (i.e. unlinked to an analysis), and (D) verifying that taxon labels are recognizable by biologists, spelled correctly, and mapped to external taxonomies whenever possible. TreeBASE provides a special advanced access URL for anonymous reviewers and referees to provide additional quality control. Although additional NSF requirements relating to provenance and how data were generated are not normally required or scrutinized by TreeBASE, submitters who flag their submission as NSF-sponsored data will receive special attention by our staff. In these cases, TreeBASE staff will check to make sure that provenance and analysis metadata are adequately provided, and, as needed, communicate with the submitter and assist in properly formatting and ingesting these data. </p> +<h2>Data Standards and Dissemination</h2> +<p>TreeBASE plans to remain in compliance with the emerging, but still evolving, standard of Minimal Information for a Phylogenetic Analysis (<a href="http://www.nescent.org/sites/evoio/MIAPA" target="_blank">MIAPA</a>). In addition, TreeBASE publishes persistant and resolvable globally unique identifiers for all major data objects and disseminates data and metadata using commonly accepted standards. A Restful <a href="http://www.nescent.org/wg/evoinfo/index.php?title=PhyloWS" target="_blank">PhyloWS</a> API exposes metadata using RSS feeds in RDF; a <a href="http://www.nexml.org/" target="_blank">NeXML</a> serialization exposes data marked up with metadata using published vocabularies and fully qualified URIs in compliance with <a href="http://linkeddata.org/" target="_blank">Linked Data</a> standards. Basic record metadata are published through an OIA-PMH service and records are mirrored by Dryad, which provides a secondary Dryad <a href="http://www.datacite.org" target="_blank">DataCite DOI</a>. However, for most people in the scientific community, data will be retrieved using the web user interface and downloaded in the NEXUS format, and metadata will be downloaded in tab-separated text format. </p> +<h2>Data Persistance</h2> +<p>Although no data service can guarantee indefinite persistance, TreeBASE will make every effort to preserve it services as long as possible. Additionally, the Articles of Incorporation of the <a href="http://www.phylofoundation.org" target="_blank">Phyloinformatics Research Foundation</a>, which oversees TreeBASE activities, specifies that if dissolution is ever required the assets will be transferred to a similar entity with a comparable mission. </p> +<h2>Preparing a Data Management Plan for NSF</h2> +<p>Scientists are welcome to designate TreeBASE as their selected repository and dissemination service for phylogenetic data generated by sponsored research. In this document, the following should be mentioned:</p> +<ul> + <li>Specify the name(s) of the person(s) responsible for preparing the data matrices, trees, and metadata for submission to TreeBASE.</li> + <li>Identify the kinds of data that will be submitted, including provenance and analysis metadata as outlined above. For metadata not accepted by TreeBASE (e.g. digital images of specimens), identify other repositories where these will be stored (e.g. <a href="http://www.morphbank.net/" target="_blank">Morphbank</a> or <a href="http://www.morphobank.org/" target="_blank">Morphobank</a>), and indicate how these data objects will be linked between TreeBASE data and the other repository (e.g. using shared specimen catalog numbers). </li> + <li>For your phylogenetic data, you can report that your data will be serialized using TreeBASE's data formats: NEXUS, for character and tree data alone, and NeXML for these data plus marked up with supplied metadata (e.g. basic Dublin Core publication data, basic Darwin Core specimen information, RBR collection codes and catalog numbers, uBio and NCBI taxon identification numbers, and Genbank accession numbers).</li> + <li>Provide an overview of access and sharing. For your TreeBASE-submitted data, you can state that TreeBASE makes all data and metadata freely available to the public once the manuscript under review has been accepted by a peer-reviewed publisher. TreeBASE will allow for data embargo periods according to the policies of the journal, but once data are public they are assumed to be released to the public domain without any restrictions on reuse. We recommend that you state that you will provide TreeBASE's resolvable GUIDs for your deposited data in future progress reports to NSF, in relevant publications, and in your lab's web page. </li> + <li>State that you will flag your submissions to TreeBASE as data subject to your data management plan so as to receive special attention by TreeBASE staff to help ensure that the data are richly annotated and fully compliant for maximum reuse in accordance with community standards in phylogenetics. </li> +</ul> +<p>TreeBASE suggests that for each submission of data from sponsored research you contribute at least $50 towards defraying the costs of storage and dissemination, as well as in support of the additional scrutiny by TreeBASE staff for NSF data management compliance. This fee is collected by the Phyloinformatics Research Foundation, which overseas TreeBASE activities. Anticipated cost can be budgeted under publication expenses on your grant proposal's budget. </p> +<p><hr /></p> +<table width="100%" border="0"> + <tr> + <td width="50%" valign="top">Data storage contribution for sponsored research:</td> + <td width="50%" valign="top">Alternatively, please consider a donation towards TreeBASE activities:</td> + </tr> + <tr> + <td><form target="paypal" action="https://www.paypal.com/cgi-bin/webscr" method="post"> +<input type="hidden" name="cmd" value="_s-xclick"> +<input type="hidden" name="hosted_button_id" value="DMT5Y327LZMDA"> +<table> +<tr><td><input type="hidden" name="on0" value="TreeBASE Study URI:">TreeBASE Study URI:</td></tr><tr><td><input type="text" name="os0" maxlength="60"></td></tr> +</table> +<input type="image" src="http://www.phylofoundation.org/icns/sub.jpg" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> +<img alt="" border="0" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/i/scr/pixel.gif" width="1" height="1"> +</form></td> + <td><form action="https://www.paypal.com/cgi-bin/webscr" method="post"> +<input type="hidden" name="cmd" value="_s-xclick"> +<input type="hidden" name="hosted_button_id" value="W9YAU65RHGZRC"> +<input type="image" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!"> +<img alt="" border="0" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_US/i/scr/pixel.gif" width="1" height="1"> +</form></td> + </tr> +</table> + +</div> \ No newline at end of file Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-29 18:54:30 UTC (rev 823) +++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-30 22:03:40 UTC (rev 824) @@ -921,7 +921,8 @@ <prop key="/phylows/taxon/**">phyloWSTaxonController</prop> <prop key="/phylows/tree/**">phyloWSTreeController</prop> <prop key="/phylows/matrix/**">phyloWSMatrixController</prop> - <prop key="/about.html">filenameController</prop> + <prop key="/about.html">filenameController</prop> + <prop key="/dataMan.html">filenameController</prop> <prop key="/home.html">filenameController</prop> <prop key="/login.html">filenameController</prop> <prop key="/urlAPI.html">filenameController</prop> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-04-29 18:54:36
|
Revision: 823 http://treebase.svn.sourceforge.net/treebase/?rev=823&view=rev Author: hshyket Date: 2011-04-29 18:54:30 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Updating citation json information to be displayed using c:out Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp 2011-04-29 00:28:00 UTC (rev 822) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp 2011-04-29 18:54:30 UTC (rev 823) @@ -6,14 +6,14 @@ citationType:'${citation.citationType}', <c:choose> <c:when test="${citation.citationType == 'Article'}"> - journal:'${citation.journal}' + journal:'<c:out value="${citation.journal}"/>' </c:when> <c:when test="${citation.citationType == 'Book'}"> - booktitle:'${citation.bookTitle}' + booktitle:'<c:out value="${citation.bookTitle}"/>' </c:when> <c:when test="${citation.citationType == 'Book Section'}"> - booktitle:'${citation.bookTitle}', - sectiontitle:'${citation.sectionTitle}', + booktitle:'<c:out value="${citation.bookTitle}"/>', + sectiontitle:'<c:out value="${citation.sectionTitle}"/>', </c:when> </c:choose> } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: SourceForge.net <no...@so...> - 2011-04-29 18:27:51
|
Bugs item #3287818, was opened at 2011-04-15 15:14 Message generated for change (Comment added) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3287818&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None >Status: Closed Priority: 7 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: hshyket (hshyket) Summary: Select errors should prevent Changing to Ready State Initial Comment: When a submitter tries to toggle the submission to "Ready" state, s/he is taken to this page: http://www.treebase.org/treebase-web/user/readyState.html?submissionid=xxxxx. At that point the submitter is warned if some taxon labels have not been matched. The warning says "We notice that some of your taxon labels have failed to be validated against an external taxonomy. Unless it is impossible to validate these labels, TreeBASE may refuse or delay the acceptance of your data." This test and warning is excessively stringent and should be disabled. However, there are other warnings that should be inserted, as follows. The Tool Box has a system where if an item has not be visited or has an error, the item is highlighted in yellow. One of those items is "Notes", which appears in yellow if the user has not entered information in the "Notes for study" filed. This is an excessive warning, especially seeing as these Notes are not shown to the public. Instead, yellow highlighting warning should be removed from the Notes. What remains are highlight warnings for Citation, Authors, Files, Taxa, Matrices, Trees, and Analyses -- which is fine. So, having removed the Notes highlighting and the taxon labels warning, what we need is a new quality check that hides the "Submit" button from the user unless there are no more remaining yellow highlighted items. If the Submit button is hidden because of a yellow highlighted item, the message to show is the following: ------------- The items in the Tool Box on the right that are highlighted in yellow indicate that the item either has not been visited or there is an error. Hovering your mouse over the item will indicate the nature of the problem. Your submission cannot be changed to "Ready" state until all highlighted items are addressed. Please return to your submission to complete it. If you think this request is in error, please contact <a href='mailto:he...@tr...?subject=TreeBASE Submission Sxxxxx'>help</a>. The most common problems include: (1) The submitter has not entered a citation that at a minimum must include the authors, year, title, and journal name. (2) The submitter has "orphaned" matrices or trees: i.e., there are matrices that are not listed as inputs to at least one analysis; or trees that are not listed as outputs from at least one analysis. If your paper does not include a tree, please submit a generic neighbor joining tree to satisfy this requirement. (3) The output tree of an analysis has taxon labels that do not match with the input matrix (i.e. there are taxon labels in the tree that are missing from the matrix or matrices that produced the tree). Preparing your submission using <a href='http://mesquiteproject.org/'>Mesquite</a>, in which both matrices and trees are part of the same Mesquite project and share a common taxon block, will avoid the problem of mismatched taxon labels. (4) The submitter has not attempted to validate the taxon labels by clicking the "Validate Taxon Labels" button in the Taxa section. ---------------------------------------------------------------------- >Comment By: William Piel (sfrgpiel) Date: 2011-04-29 14:27 Message: This is fixed, except that the session may not be set properly -- that is recorded in a separate bug. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3287818&group_id=248804 |
From: SourceForge.net <no...@so...> - 2011-04-29 18:26:46
|
Bugs item #3295057, was opened at 2011-04-29 14:26 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3295057&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 8 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: hshyket (hshyket) Summary: Session not set correctly when changing to readystate Initial Comment: When a submitter clicks on the "Change to Ready State" button (http://treebase-dev.nescent.org/treebase-web/user/readyState.html?submissionid=xxxxx) the Tool Box may o rmay not appear, and if it does appear it may not have the correct warning messages. This is because the session is not set properly -- ie it is not being set the way it is set for edit submission (http://treebase-dev.nescent.org/treebase-web/user/summary.html?id=xxxxxx). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3295057&group_id=248804 |
From: <rv...@us...> - 2011-04-29 00:28:06
|
Revision: 822 http://treebase.svn.sourceforge.net/treebase/?rev=822&view=rev Author: rvos Date: 2011-04-29 00:28:00 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Reverting Property Changed: ---------------- trunk/treebase-web/src/main/webapp/images/ Property changes on: trunk/treebase-web/src/main/webapp/images ___________________________________________________________________ Added: svn:ignore + treebase.ai treebase.psd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-29 00:27:25
|
Revision: 821 http://treebase.svn.sourceforge.net/treebase/?rev=821&view=rev Author: rvos Date: 2011-04-29 00:27:19 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Reverting Removed Paths: ------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java Deleted: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java 2011-04-29 00:21:29 UTC (rev 820) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java 2011-04-29 00:27:19 UTC (rev 821) @@ -1,114 +0,0 @@ -package org.cipres.treebase.web.controllers; - -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.cipres.treebase.TreebaseUtil; -import org.cipres.treebase.domain.matrix.Matrix; -import org.cipres.treebase.domain.search.MatrixSearchResults; -import org.cipres.treebase.domain.search.SearchResultsType; -import org.cipres.treebase.domain.search.StudySearchResults; -import org.cipres.treebase.domain.search.TaxonSearchResults; -import org.cipres.treebase.domain.search.TreeSearchResults; -import org.springframework.validation.BindException; -import org.springframework.web.servlet.ModelAndView; -import org.z3950.zing.cql.CQLNode; -import org.z3950.zing.cql.CQLParseException; -import org.z3950.zing.cql.CQLParser; - -import org.cipres.treebase.domain.study.Study; -import org.cipres.treebase.domain.taxon.Taxon; -import org.cipres.treebase.domain.tree.PhyloTree; -import org.cipres.treebase.web.controllers.TreeSearchController; -import org.cipres.treebase.web.controllers.TaxonSearchController; -import org.cipres.treebase.web.controllers.StudySearchController; -import org.cipres.treebase.web.controllers.MatrixSearchController; - -public class MainSearchController extends SearchController { - - @Override - protected ModelAndView handleQueryRequest(HttpServletRequest request, - HttpServletResponse response, BindException errors, String query) - throws CQLParseException, IOException, InstantiationException { - String anyQuery = "dcterms.identifier=" + query + " or dcterms.title=" + query; - CQLParser parser = new CQLParser(); - CQLNode root = parser.parse(anyQuery); - - StudySearchResults studyResults = new StudySearchResults(doDelegatedStudyQuery(root, request, response, errors)); - request.setAttribute("studyResults", studyResults); - - MatrixSearchResults matrixResults = new MatrixSearchResults(doDelegatedMatrixQuery(root, request, response, errors)); - request.setAttribute("matrixResults", matrixResults); - - TaxonSearchResults taxonResults = new TaxonSearchResults(doDelegatedTaxonQuery(root, request, response, errors)); - request.setAttribute("taxonResults", taxonResults); - - TreeSearchResults treeResults = new TreeSearchResults(doDelegatedTreeQuery(root, request, response, errors)); - request.setAttribute("treeResults",treeResults); - - return new ModelAndView("search/mainSearch"); - } - - protected ModelAndView onSubmit( - HttpServletRequest request, - HttpServletResponse response, - Object command, - BindException errors) throws Exception { - clearMessages(request); - String query = request.getParameter("query"); - if ( TreebaseUtil.isEmpty(query) || "".equals(query) ) { - addMessage(request,"You provided an empty search query"); - } - return this.handleQueryRequest(request, response, errors, query); - } - - private Set<Study> doDelegatedStudyQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { - StudySearchController searcher = new StudySearchController(); - CQLNode normalized = searcher.normalizeParseTree(node); - Set<Study> results = new HashSet<Study>(); - return searcher.doCQLQuery(normalized, results, request, response, errors); - } - - private Set<Matrix> doDelegatedMatrixQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { - MatrixSearchController searcher = new MatrixSearchController(); - CQLNode normalized = searcher.normalizeParseTree(node); - Set<Matrix> results = new HashSet<Matrix>(); - return searcher.doCQLQuery(normalized, results, request, response, errors); - } - - private Set<PhyloTree> doDelegatedTreeQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { - TreeSearchController searcher = new TreeSearchController(); - CQLNode normalized = searcher.normalizeParseTree(node); - Set<PhyloTree> results = new HashSet<PhyloTree>(); - return searcher.doCQLQuery(normalized, results, request, response, errors); - } - - private Set<Taxon> doDelegatedTaxonQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { - TaxonSearchController searcher = new TaxonSearchController(); - CQLNode normalized = searcher.normalizeParseTree(node); - Set<Taxon> results = new HashSet<Taxon>(); - return searcher.doCQLQuery(normalized, results, request); - } - - @Override - protected Map<String, String> getPredicateMapping() { - return new HashMap<String,String>(); - } - - @Override - public String getDefaultViewURL() { - return "mainSearch.html"; - } - - @Override - SearchResultsType currentSearchType() { - return SearchResultsType.STUDY; - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-29 00:21:35
|
Revision: 820 http://treebase.svn.sourceforge.net/treebase/?rev=820&view=rev Author: rvos Date: 2011-04-29 00:21:29 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Reverting Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java 2011-04-29 00:20:39 UTC (rev 819) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java 2011-04-29 00:21:29 UTC (rev 820) @@ -20,7 +20,6 @@ import org.cipres.treebase.domain.search.MatrixSearchResults; import org.cipres.treebase.domain.search.SearchResults; import org.cipres.treebase.domain.search.SearchResultsType; -import org.cipres.treebase.domain.search.TreeSearchResults; import org.cipres.treebase.web.Constants; import org.cipres.treebase.web.util.RequestMessageSetter; import org.cipres.treebase.web.util.SearchMessageSetter; @@ -33,7 +32,6 @@ 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; /** 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-04-29 00:20:39 UTC (rev 819) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2011-04-29 00:21:29 UTC (rev 820) @@ -31,7 +31,6 @@ 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; /** Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java 2011-04-29 00:20:39 UTC (rev 819) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java 2011-04-29 00:21:29 UTC (rev 820) @@ -15,7 +15,6 @@ import org.cipres.treebase.TreebaseIDString; import org.cipres.treebase.TreebaseUtil; import org.cipres.treebase.TreebaseIDString.MalformedTreebaseIDString; -import org.cipres.treebase.domain.search.MatrixSearchResults; import org.cipres.treebase.domain.search.SearchResults; import org.cipres.treebase.domain.search.SearchResultsType; import org.cipres.treebase.domain.search.SearchService; @@ -36,7 +35,6 @@ 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; public class TaxonSearchController extends SearchController { Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java 2011-04-29 00:20:39 UTC (rev 819) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java 2011-04-29 00:21:29 UTC (rev 820) @@ -30,7 +30,6 @@ 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; /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-29 00:20:45
|
Revision: 819 http://treebase.svn.sourceforge.net/treebase/?rev=819&view=rev Author: rvos Date: 2011-04-29 00:20:39 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Reverting Removed Paths: ------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp Deleted: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp 2011-04-29 00:19:26 UTC (rev 818) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp 2011-04-29 00:20:39 UTC (rev 819) @@ -1,36 +0,0 @@ -<%@ include file="/common/taglibs.jsp"%> - -<title><fmt:message key="search.main"/></title> -<body id="s-main"/> - -<div id="wrap"> - <!-- these are the tabs that switch between search forms --> - <jsp:include page="/common/search-nav.jsp"/> - <div id="s-clear"></div> - - <c:set var="searchType" value="main" scope="request"/> - - <!-- this is the simple search box --> - <jsp:include page="mainSimpleSearchForm.jsp"/> - <div id="s-clear"></div> - - <!-- this contains any search warnings, e.g. if an empty query string was provided --> - <jsp:include page="searchMessages.jsp"/> - - <div id="searchResultsList"> - <c:set var="resultSet" value="${studyResults}"/> - <jsp:include page="studyList.jsp"/> - - <c:set var="resultSet" value="${matrixResults}"/> - <jsp:include page="matrixList.jsp"/> - - <c:set var="resultSet" value="${treeResults}"/> - <jsp:include page="treeList.jsp"/> - - <c:set var="resultSet" value="${taxonResults}"/> - <jsp:include page="taxonList.jsp"/> - </div> - - <div id="output"></div> - -</div> \ No newline at end of file Deleted: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp 2011-04-29 00:19:26 UTC (rev 818) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp 2011-04-29 00:20:39 UTC (rev 819) @@ -1,11 +0,0 @@ -<%@ include file="/common/taglibs.jsp"%> -<form id="searchSimple" method="post"> - <fieldset> - <input type="hidden" name="formName" value="mainSimple"/> - <input type="text" class="textCell" style="width:150px" name="query" id="keyword" value="${query}"/> - <input type="submit" value="Search"> - <a href="#" class="openHelp" onclick="openHelp('mainSimpleSearchForm')"> - <img class="iconButton" src="<fmt:message key="icons.help"/>" /> - </a> - </fieldset> -</form> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-29 00:19:32
|
Revision: 818 http://treebase.svn.sourceforge.net/treebase/?rev=818&view=rev Author: rvos Date: 2011-04-29 00:19:26 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Reverting Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-29 00:04:44 UTC (rev 817) +++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-29 00:19:26 UTC (rev 818) @@ -743,10 +743,10 @@ <property name="searchService"><ref bean="searchService"></ref></property> </bean> - <bean id="mainSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.MainSearchController"> + <!-- bean id="mainSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.MainSearchController"> <property name="formView"><value>search/mainSearch</value></property> <property name="successView"><value>search/mainSearch</value></property> - </bean> + </bean--> <bean id="studySearchController" parent="searchController" class="org.cipres.treebase.web.controllers.StudySearchController"> <property name="formView"><value>search/studySearch</value></property> @@ -1009,7 +1009,7 @@ <prop key="/search/treeTopSearch.html">treeTopSearchController</prop> <prop key="/search/matrixSearch.html">matrixSearchController</prop> <prop key="/search/taxonSearch.html">taxonSearchController</prop> - <prop key="/search/mainSearch.html">mainSearchController</prop> + <!-- prop key="/search/mainSearch.html">mainSearchController</prop--> <!-- SEARCH RESULTS SECTION --> <prop key="/search/study/summary.html">searchSummaryController</prop> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-29 00:04:50
|
Revision: 817 http://treebase.svn.sourceforge.net/treebase/?rev=817&view=rev Author: rvos Date: 2011-04-29 00:04:44 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Removed main search results type Modified Paths: -------------- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java =================================================================== --- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java 2011-04-28 23:51:40 UTC (rev 816) +++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java 2011-04-29 00:04:44 UTC (rev 817) @@ -10,5 +10,4 @@ MATRIX, TREE, TAXON, - MAIN, } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-28 23:51:46
|
Revision: 816 http://treebase.svn.sourceforge.net/treebase/?rev=816&view=rev Author: rvos Date: 2011-04-28 23:51:40 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Setting placeholder SearchResultsType to STUDY Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java 2011-04-28 23:39:53 UTC (rev 815) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java 2011-04-28 23:51:40 UTC (rev 816) @@ -108,7 +108,7 @@ @Override SearchResultsType currentSearchType() { - return SearchResultsType.MAIN; + return SearchResultsType.STUDY; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-28 23:39:59
|
Revision: 815 http://treebase.svn.sourceforge.net/treebase/?rev=815&view=rev Author: rvos Date: 2011-04-28 23:39:53 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Added findAll search service Modified Paths: -------------- trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractService.java trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractServiceImpl.java trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractService.java =================================================================== --- trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractService.java 2011-04-28 23:38:54 UTC (rev 814) +++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractService.java 2011-04-28 23:39:53 UTC (rev 815) @@ -100,7 +100,17 @@ String attributeName, String target); + /** + * Find all persistent objects of a certain class + * + * @param <T> + * @param T + * @return + */ + public <T extends TBPersistable> Collection<T> findAll(Class T); + + /** * Search all persistent objects of a certain class for those that contain a string in a particular attribute field. * * @param T - the class in which you want to find objects Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractServiceImpl.java =================================================================== --- trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractServiceImpl.java 2011-04-28 23:38:54 UTC (rev 814) +++ trunk/treebase-core/src/main/java/org/cipres/treebase/service/AbstractServiceImpl.java 2011-04-28 23:39:53 UTC (rev 815) @@ -100,6 +100,14 @@ return findSomethingByString(T, attributeName, target, true); } + /* + * (non-Javadoc) + * @see org.cipres.treebase.service.AbstractService#findAll(java.lang.Class) + */ + public <T extends TBPersistable> Collection<T> findAll(Class T) { + return getDomainHome().findAll(T); + } + /* (non-Javadoc) * @see org.cipres.treebase.service.AbstractService#findSomethingByString(java.lang.Class, java.lang.String, java.lang.String) */ Modified: trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java =================================================================== --- trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2011-04-28 23:38:54 UTC (rev 814) +++ trunk/treebase-core/src/test/java/org/cipres/treebase/auxdata/AuxDataTest.java 2011-04-28 23:39:53 UTC (rev 815) @@ -217,6 +217,11 @@ public Matrix findByTB1StudyID(String pTB1MatrixID) { // TODO Auto-generated method stub return null; + } + + public <T extends TBPersistable> Collection<T> findAll(Class T) { + // TODO Auto-generated method stub + return null; } } @@ -290,6 +295,11 @@ Boolean caseSensitive) { // TODO Auto-generated method stub return null; + } + + public <T extends TBPersistable> Collection<T> findAll(Class T) { + // TODO Auto-generated method stub + return null; } } @@ -347,6 +357,11 @@ // TODO Auto-generated method stub return null; } + + public <T extends TBPersistable> Collection<T> findAll(Class T) { + // TODO Auto-generated method stub + return null; + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-28 23:39:00
|
Revision: 814 http://treebase.svn.sourceforge.net/treebase/?rev=814&view=rev Author: rvos Date: 2011-04-28 23:38:54 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Added MAIN search results type Modified Paths: -------------- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java =================================================================== --- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java 2011-04-28 23:37:52 UTC (rev 813) +++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/search/SearchResultsType.java 2011-04-28 23:38:54 UTC (rev 814) @@ -10,4 +10,5 @@ MATRIX, TREE, TAXON, + MAIN, } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-28 23:37:58
|
Revision: 813 http://treebase.svn.sourceforge.net/treebase/?rev=813&view=rev Author: rvos Date: 2011-04-28 23:37:52 +0000 (Thu, 28 Apr 2011) Log Message: ----------- This commit adds functionality for a simple search box that searches identifiers and names for studies, trees, matrices and taxa. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml Added Paths: ----------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp Added: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java (rev 0) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MainSearchController.java 2011-04-28 23:37:52 UTC (rev 813) @@ -0,0 +1,114 @@ +package org.cipres.treebase.web.controllers; + +import java.io.IOException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.cipres.treebase.TreebaseUtil; +import org.cipres.treebase.domain.matrix.Matrix; +import org.cipres.treebase.domain.search.MatrixSearchResults; +import org.cipres.treebase.domain.search.SearchResultsType; +import org.cipres.treebase.domain.search.StudySearchResults; +import org.cipres.treebase.domain.search.TaxonSearchResults; +import org.cipres.treebase.domain.search.TreeSearchResults; +import org.springframework.validation.BindException; +import org.springframework.web.servlet.ModelAndView; +import org.z3950.zing.cql.CQLNode; +import org.z3950.zing.cql.CQLParseException; +import org.z3950.zing.cql.CQLParser; + +import org.cipres.treebase.domain.study.Study; +import org.cipres.treebase.domain.taxon.Taxon; +import org.cipres.treebase.domain.tree.PhyloTree; +import org.cipres.treebase.web.controllers.TreeSearchController; +import org.cipres.treebase.web.controllers.TaxonSearchController; +import org.cipres.treebase.web.controllers.StudySearchController; +import org.cipres.treebase.web.controllers.MatrixSearchController; + +public class MainSearchController extends SearchController { + + @Override + protected ModelAndView handleQueryRequest(HttpServletRequest request, + HttpServletResponse response, BindException errors, String query) + throws CQLParseException, IOException, InstantiationException { + String anyQuery = "dcterms.identifier=" + query + " or dcterms.title=" + query; + CQLParser parser = new CQLParser(); + CQLNode root = parser.parse(anyQuery); + + StudySearchResults studyResults = new StudySearchResults(doDelegatedStudyQuery(root, request, response, errors)); + request.setAttribute("studyResults", studyResults); + + MatrixSearchResults matrixResults = new MatrixSearchResults(doDelegatedMatrixQuery(root, request, response, errors)); + request.setAttribute("matrixResults", matrixResults); + + TaxonSearchResults taxonResults = new TaxonSearchResults(doDelegatedTaxonQuery(root, request, response, errors)); + request.setAttribute("taxonResults", taxonResults); + + TreeSearchResults treeResults = new TreeSearchResults(doDelegatedTreeQuery(root, request, response, errors)); + request.setAttribute("treeResults",treeResults); + + return new ModelAndView("search/mainSearch"); + } + + protected ModelAndView onSubmit( + HttpServletRequest request, + HttpServletResponse response, + Object command, + BindException errors) throws Exception { + clearMessages(request); + String query = request.getParameter("query"); + if ( TreebaseUtil.isEmpty(query) || "".equals(query) ) { + addMessage(request,"You provided an empty search query"); + } + return this.handleQueryRequest(request, response, errors, query); + } + + private Set<Study> doDelegatedStudyQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { + StudySearchController searcher = new StudySearchController(); + CQLNode normalized = searcher.normalizeParseTree(node); + Set<Study> results = new HashSet<Study>(); + return searcher.doCQLQuery(normalized, results, request, response, errors); + } + + private Set<Matrix> doDelegatedMatrixQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { + MatrixSearchController searcher = new MatrixSearchController(); + CQLNode normalized = searcher.normalizeParseTree(node); + Set<Matrix> results = new HashSet<Matrix>(); + return searcher.doCQLQuery(normalized, results, request, response, errors); + } + + private Set<PhyloTree> doDelegatedTreeQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { + TreeSearchController searcher = new TreeSearchController(); + CQLNode normalized = searcher.normalizeParseTree(node); + Set<PhyloTree> results = new HashSet<PhyloTree>(); + return searcher.doCQLQuery(normalized, results, request, response, errors); + } + + private Set<Taxon> doDelegatedTaxonQuery(CQLNode node, HttpServletRequest request, HttpServletResponse response, BindException errors) throws InstantiationException { + TaxonSearchController searcher = new TaxonSearchController(); + CQLNode normalized = searcher.normalizeParseTree(node); + Set<Taxon> results = new HashSet<Taxon>(); + return searcher.doCQLQuery(normalized, results, request); + } + + @Override + protected Map<String, String> getPredicateMapping() { + return new HashMap<String,String>(); + } + + @Override + public String getDefaultViewURL() { + return "mainSearch.html"; + } + + @Override + SearchResultsType currentSearchType() { + return SearchResultsType.MAIN; + } + +} Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java 2011-04-28 21:08:13 UTC (rev 812) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/MatrixSearchController.java 2011-04-28 23:37:52 UTC (rev 813) @@ -120,7 +120,7 @@ } } - private Set<Matrix> doCQLQuery( + protected Set<Matrix> doCQLQuery( CQLNode node, Set<Matrix> results, HttpServletRequest request, 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-04-28 21:08:13 UTC (rev 812) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/StudySearchController.java 2011-04-28 23:37:52 UTC (rev 813) @@ -149,7 +149,7 @@ } } - private Set<Study> doCQLQuery( + protected Set<Study> doCQLQuery( CQLNode node, Set<Study> results, HttpServletRequest request, Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java 2011-04-28 21:08:13 UTC (rev 812) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TaxonSearchController.java 2011-04-28 23:37:52 UTC (rev 813) @@ -97,7 +97,7 @@ } } - private Set<Taxon> doCQLQuery(CQLNode node, Set<Taxon> results, HttpServletRequest request) { + protected Set<Taxon> doCQLQuery(CQLNode node, Set<Taxon> results, HttpServletRequest request) { if ( node instanceof CQLBooleanNode ) { Set<Taxon> resultsLeft = doCQLQuery(((CQLBooleanNode)node).left,results, request); Set<Taxon> resultsRight = doCQLQuery(((CQLBooleanNode)node).right,results, request); Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java 2011-04-28 21:08:13 UTC (rev 812) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/TreeSearchController.java 2011-04-28 23:37:52 UTC (rev 813) @@ -116,7 +116,7 @@ } } - private Set<PhyloTree> doCQLQuery( + protected Set<PhyloTree> doCQLQuery( CQLNode node, Set<PhyloTree> results, HttpServletRequest request, Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp (rev 0) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSearch.jsp 2011-04-28 23:37:52 UTC (rev 813) @@ -0,0 +1,36 @@ +<%@ include file="/common/taglibs.jsp"%> + +<title><fmt:message key="search.main"/></title> +<body id="s-main"/> + +<div id="wrap"> + <!-- these are the tabs that switch between search forms --> + <jsp:include page="/common/search-nav.jsp"/> + <div id="s-clear"></div> + + <c:set var="searchType" value="main" scope="request"/> + + <!-- this is the simple search box --> + <jsp:include page="mainSimpleSearchForm.jsp"/> + <div id="s-clear"></div> + + <!-- this contains any search warnings, e.g. if an empty query string was provided --> + <jsp:include page="searchMessages.jsp"/> + + <div id="searchResultsList"> + <c:set var="resultSet" value="${studyResults}"/> + <jsp:include page="studyList.jsp"/> + + <c:set var="resultSet" value="${matrixResults}"/> + <jsp:include page="matrixList.jsp"/> + + <c:set var="resultSet" value="${treeResults}"/> + <jsp:include page="treeList.jsp"/> + + <c:set var="resultSet" value="${taxonResults}"/> + <jsp:include page="taxonList.jsp"/> + </div> + + <div id="output"></div> + +</div> \ No newline at end of file Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp (rev 0) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/mainSimpleSearchForm.jsp 2011-04-28 23:37:52 UTC (rev 813) @@ -0,0 +1,11 @@ +<%@ include file="/common/taglibs.jsp"%> +<form id="searchSimple" method="post"> + <fieldset> + <input type="hidden" name="formName" value="mainSimple"/> + <input type="text" class="textCell" style="width:150px" name="query" id="keyword" value="${query}"/> + <input type="submit" value="Search"> + <a href="#" class="openHelp" onclick="openHelp('mainSimpleSearchForm')"> + <img class="iconButton" src="<fmt:message key="icons.help"/>" /> + </a> + </fieldset> +</form> \ No newline at end of file Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-28 21:08:13 UTC (rev 812) +++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml 2011-04-28 23:37:52 UTC (rev 813) @@ -742,11 +742,15 @@ <property name="taxonLabelService"><ref bean="taxonLabelService"></ref></property> <property name="searchService"><ref bean="searchService"></ref></property> </bean> + + <bean id="mainSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.MainSearchController"> + <property name="formView"><value>search/mainSearch</value></property> + <property name="successView"><value>search/mainSearch</value></property> + </bean> <bean id="studySearchController" parent="searchController" class="org.cipres.treebase.web.controllers.StudySearchController"> <property name="formView"><value>search/studySearch</value></property> - <property name="successView"><value>search/studySearch</value></property> - + <property name="successView"><value>search/studySearch</value></property> </bean> <bean id="treeSearchController" parent="searchController" class="org.cipres.treebase.web.controllers.TreeSearchController"> @@ -1005,6 +1009,7 @@ <prop key="/search/treeTopSearch.html">treeTopSearchController</prop> <prop key="/search/matrixSearch.html">matrixSearchController</prop> <prop key="/search/taxonSearch.html">taxonSearchController</prop> + <prop key="/search/mainSearch.html">mainSearchController</prop> <!-- SEARCH RESULTS SECTION --> <prop key="/search/study/summary.html">searchSummaryController</prop> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-04-28 21:08:19
|
Revision: 812 http://treebase.svn.sourceforge.net/treebase/?rev=812&view=rev Author: hshyket Date: 2011-04-28 21:08:13 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Placing back in taxa yellow on menu item Modified Paths: -------------- trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js Modified: trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js =================================================================== --- trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-28 20:48:59 UTC (rev 811) +++ trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-28 21:08:13 UTC (rev 812) @@ -390,7 +390,7 @@ ul = createUnorderedList(taxonLabels,'taxonLabel','taxonLabel'); ul.style.display = 'none'; taxaLi.appendChild(ul); - /*var taxonLabelLis = ul.select('li'); + var taxonLabelLis = ul.select('li'); var analyzed = 'analyzed'; for ( var i = 0; i < taxonLabelLis.length; i++ ) { var id = taxonLabelLis[i].id; @@ -407,7 +407,7 @@ taxaLi.addClassName(analyzed); if ( analyzed == 'notAnalyzed' ) { taxaLi.select('a.Taxa')[0].title = 'Some taxa have not been linked to external taxonomy yet'; - }*/ + } } else { taxaLi.addClassName('emptyList'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sfr...@us...> - 2011-04-28 20:49:05
|
Revision: 811 http://treebase.svn.sourceforge.net/treebase/?rev=811&view=rev Author: sfrgpiel Date: 2011-04-28 20:48:59 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Changing warning message to red Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-28 20:35:29 UTC (rev 810) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-28 20:48:59 UTC (rev 811) @@ -14,7 +14,7 @@ </p> </c:if> --%> -<p class="readyStateError" style="font-weight:bold"> +<p class="readyStateError" style="color:red; font-weight:bold; display:none;"> Sorry! Errors in your submission prevent you from changing the status to 'Ready State' at this time. </p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sfr...@us...> - 2011-04-28 20:35:35
|
Revision: 810 http://treebase.svn.sourceforge.net/treebase/?rev=810&view=rev Author: sfrgpiel Date: 2011-04-28 20:35:29 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Made a few changes to the verbiage. Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-28 19:51:10 UTC (rev 809) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-28 20:35:29 UTC (rev 810) @@ -14,15 +14,10 @@ </p> </c:if> --%> -<p style="font-weight:bold"> - Are you sure that you want to change the status of this study to 'Ready State'? - This means that you are ready for the review process. If yes press Submit, - else choose the Cancel button. +<p class="readyStateError" style="font-weight:bold"> + Sorry! Errors in your submission prevent you from changing the status to 'Ready State' at this time. </p> -<p> - Please note: after you press the Submit button you will no longer be able to make any further changes to this study. - The study will be available in 'READ ONLY' mode. -</p> + <p class="readyStateError" style="display:none;"> The items in the Tool Box on the right that are highlighted in yellow indicate that the item either has not been visited or there is an error. Hovering your mouse over the item will indicate the nature of the problem. Your submission cannot be changed to "Ready" state until all highlighted items are addressed. Please return to your submission to complete it. If you think this request is in error, please contact <a href='mailto:he...@tr...?subject=TreeBASE Submission S<c:out value="${submissionNumber}"/>'>help</a>. <br /><br /> @@ -33,7 +28,18 @@ (3) The output tree of an analysis has taxon labels that do not match with the input matrix (i.e. there are taxon labels in the tree that are missing from the matrix or matrices that produced the tree). Preparing your submission using <a href='http://mesquiteproject.org/'>Mesquite</a>, in which both matrices and trees are part of the same Mesquite project and share a common taxon block, will avoid the problem of mismatched taxon labels.<br /> (4) The submitter has not attempted to validate the taxon labels by clicking the "Validate Taxon Labels" button in the Taxa section. </p> + +<p style="font-weight:bold"> + Are you sure that you want to change the status of this study to 'Ready State'? +</p> + <p> + Changing the status of your study to 'Ready State' means that you are ready for the review process. If yes press Submit, + else choose the Cancel button. Note that after you press the Submit button you will no longer be able to make any further changes to this study. + The study will be available in 'READ ONLY' mode. +</p> + +<p> <input type="submit" name="Submit" value="Submit" id="submitReadyState"/> <input type="submit" name="_cancel" value = "Cancel"/> </p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-04-28 19:51:16
|
Revision: 809 http://treebase.svn.sourceforge.net/treebase/?rev=809&view=rev Author: hshyket Date: 2011-04-28 19:51:10 +0000 (Thu, 28 Apr 2011) Log Message: ----------- Fixing error with javascript on the ready state form. The code was firing to early for the context of the Ajax call for the menu item coloring and tooltip. Modified Paths: -------------- trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js Modified: trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js =================================================================== --- trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-27 14:44:40 UTC (rev 808) +++ trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-28 19:51:10 UTC (rev 809) @@ -487,6 +487,16 @@ } return a; } + function checkSubmitButton() { + var submitButton = $('submitReadyState'); + if (submitButton != null && submitButton != undefined) { + var notAnalyzed = $('menuList').select('li.notAnalyzed'); + if (notAnalyzed != '') { + submitButton.disable(); + $$('p.readyStateError').invoke('setStyle', { display: 'block' }); + } + }; + } //TreeBASE.writeSummary = writeSummary; TreeBASE.register(decorateMenu); TreeBASE.register(function(){ @@ -499,18 +509,11 @@ TreeBASE.submission = tmp.submission; //TreeBASE.writeSummary(); writeSummary(); + checkSubmitButton(); } }); }); - TreeBASE.register(initializeMenus); + TreeBASE.register(initializeMenus); })() -var submitButton = $('submitReadyState'); -if (submitButton != null && submitButton != undefined) { - var notAnalyzed = $$('li.notAnalyzed'); - if (notAnalyzed != null && notAnalyzed != undefined) { - submitButton.disable(); - $$('p.readyStateError').invoke('setStyle', { display: 'block' }); - } -}; /* end of closure */ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hs...@us...> - 2011-04-27 14:44:49
|
Revision: 808 http://treebase.svn.sourceforge.net/treebase/?rev=808&view=rev Author: hshyket Date: 2011-04-27 14:44:40 +0000 (Wed, 27 Apr 2011) Log Message: ----------- Fixing append issue with Mesquite String Util Modified Paths: -------------- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserDefinedCharSet.java Modified: trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserDefinedCharSet.java =================================================================== --- trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserDefinedCharSet.java 2011-04-26 15:53:43 UTC (rev 807) +++ trunk/treebase-core/src/main/java/org/cipres/treebase/domain/matrix/UserDefinedCharSet.java 2011-04-27 14:44:40 UTC (rev 808) @@ -76,8 +76,8 @@ @Override public String getNexusString() { StringBuilder sb = new StringBuilder(); - sb.append(getNexusPrefix()).append(getTitle()).append(" (CHARACTERS = ").append(StringUtil.tokenize(getMatrix().getTitle())).append(") = "); - // sb.append(getNexusPrefix()).append(StringUtil.tokenize(getTitle())).append(" (CHARACTERS = ").append(StringUtil.tokenize(getMatrix().getTitle())).append(") = "); + //sb.append(getNexusPrefix()).append(getTitle()).append(" (CHARACTERS = ").append(StringUtil.tokenize(getMatrix().getTitle())).append(") = "); + sb.append(getNexusPrefix()).append(StringUtil.tokenize(getTitle())).append(" (CHARACTERS = ").append(StringUtil.tokenize(getMatrix().getTitle())).append(") = "); for (ColumnRange colRange : getColumns()) { sb.append(" "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: SourceForge.net <no...@so...> - 2011-04-27 00:15:24
|
Bugs item #3293404, was opened at 2011-04-26 20:15 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3293404&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 7 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: hshyket (hshyket) Summary: Row Segment Metadata not displaying properly Initial Comment: When the user wants to view some matrix row metadata, the lat/longs are not being displayed. e.g.: http://www.treebase.org/treebase-web/search/study/rowSegments.html?id=11020&matrixid=8689&matrixrowid=604519 ... should show the lat/long in addition to the locality. Also, how about we do something a little fancier, like if there is a lat long pair, offer a hyperlink to a Google map in a new window showing the point, or a hyperlink to a geohack like this: http://toolserver.org/~geohack/geohack.php?params=48.8583_N_2.2945_E Also, we really need a way to download all metadata at the level of the matrix. For example, when you are at this page: http://www.treebase.org/treebase-web/search/study/matrix.html?matrixid=8689&id=11020 There should be a button that says "Download all Row Segment Metadata" for this particular matrix (if this data exists). The button should result in a download some basic format, e.g. tab-separated text or CSV. (And here again is an opportunity to create a outlink to a Google maps page with all the points for the matrix displayed) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3293404&group_id=248804 |
From: SourceForge.net <no...@so...> - 2011-04-26 23:57:31
|
Bugs item #3293398, was opened at 2011-04-26 19:57 Message generated for change (Tracker Item Submitted) made by sfrgpiel You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3293398&group_id=248804 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: ui Group: None Status: Open Priority: 7 Private: No Submitted By: William Piel (sfrgpiel) Assigned to: hshyket (hshyket) Summary: Users can search on embargoed trees and matrices Initial Comment: Data that are not yet available to the public should not be searchable. This is working for Study ID 10381: if you search on study_id = 10381, you won't get any results. However, the matrices that belong to study 10381 are, in fact, searchable. For example, you can search on matrices 5123 and 5124, and you can search on trees 7581 and 7582. You can also search on the taxon "Melpomene firma", then click on the Trees tab and see that Tree 7582 is in the results set. Although it is true that if you try to download these trees and matrices, you can't do that -- it would be better if they did not even appear in the results set. Course, in adding this requirement that only non-embargoed data can be returned in the results of a query, we need to be cautious that this added search criterion does not sacrifice on performance. Once this is fixed in the interface, let's check that it's okay in the API. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=1126676&aid=3293398&group_id=248804 |
From: <hs...@us...> - 2011-04-26 15:53:49
|
Revision: 807 http://treebase.svn.sourceforge.net/treebase/?rev=807&view=rev Author: hshyket Date: 2011-04-26 15:53:43 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Updating messages for highlighted menu items. Submit button on ready state form is greyed out if anything in yellow is selected. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java 2011-04-26 00:28:51 UTC (rev 806) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/ReadyStateController.java 2011-04-26 15:53:43 UTC (rev 807) @@ -97,7 +97,7 @@ } - protected Map<String, Boolean> referenceData(HttpServletRequest pRequest) { + /*protected Map<String, Boolean> referenceData(HttpServletRequest pRequest) { String subid = ServletRequestUtils.getStringParameter(pRequest, "submissionid", null); Study study = mStudyService.findBySubmissionID(Long.parseLong(subid)); @@ -105,6 +105,17 @@ validatedProperties.put("AnalysesStatus", study.getAnalysesStatus()); return validatedProperties; + }*/ + + protected Map<String, Object> referenceData(HttpServletRequest pRequest) { + String subid = ServletRequestUtils.getStringParameter(pRequest, "submissionid", null); + Study study = mStudyService.findBySubmissionID(Long.parseLong(subid)); + + HashMap<String, Object> validatedProperties = new HashMap<String, Object>(); + validatedProperties.put("AnalysesStatus", study.getAnalysesStatus()); + validatedProperties.put("submissionNumber", Long.parseLong(subid)); + + return validatedProperties; } /** Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp 2011-04-26 00:28:51 UTC (rev 806) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/json/citationToJSON.jsp 2011-04-26 15:53:43 UTC (rev 807) @@ -1,3 +1,20 @@ -<%@ include file="/common/taglibs.jsp"%> -<c:if test="${citation == null}">null</c:if> -<c:if test="${citation != null}">{id:${citation.id}}</c:if> \ No newline at end of file +<%@ include file="/common/taglibs.jsp"%> +<c:if test="${citation == null}">null</c:if> +<c:if test="${citation != null}"> +{ + id:${citation.id}, + citationType:'${citation.citationType}', + <c:choose> + <c:when test="${citation.citationType == 'Article'}"> + journal:'${citation.journal}' + </c:when> + <c:when test="${citation.citationType == 'Book'}"> + booktitle:'${citation.bookTitle}' + </c:when> + <c:when test="${citation.citationType == 'Book Section'}"> + booktitle:'${citation.bookTitle}', + sectiontitle:'${citation.sectionTitle}', + </c:when> + </c:choose> +} +</c:if> \ No newline at end of file Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-26 00:28:51 UTC (rev 806) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyState.jsp 2011-04-26 15:53:43 UTC (rev 807) @@ -6,12 +6,14 @@ <form method="post"> +<%-- <c:if test="${AnalysesStatus eq false}"> <p style="color:red;font-weight:bold"> We notice that some of your taxon labels have failed to be validated against an external taxonomy. Unless it is impossible to validate these labels, TreeBASE may refuse or delay the acceptance of your data. </p> -</c:if> +</c:if> +--%> <p style="font-weight:bold"> Are you sure that you want to change the status of this study to 'Ready State'? This means that you are ready for the review process. If yes press Submit, @@ -21,8 +23,18 @@ Please note: after you press the Submit button you will no longer be able to make any further changes to this study. The study will be available in 'READ ONLY' mode. </p> - -<input type="submit" name="Submit" value="Submit"/> -<input type="submit" name="_cancel" value = "Cancel"/> - +<p class="readyStateError" style="display:none;"> + The items in the Tool Box on the right that are highlighted in yellow indicate that the item either has not been visited or there is an error. Hovering your mouse over the item will indicate the nature of the problem. Your submission cannot be changed to "Ready" state until all highlighted items are addressed. Please return to your submission to complete it. If you think this request is in error, please contact <a href='mailto:he...@tr...?subject=TreeBASE Submission S<c:out value="${submissionNumber}"/>'>help</a>. + <br /><br /> + The most common problems include: + <br /><br /> + (1) The submitter has not entered a citation that at a minimum must include the authors, year, title, and journal name.<br /> + (2) The submitter has "orphaned" matrices or trees: i.e., there are matrices that are not listed as inputs to at least one analysis; or trees that are not listed as outputs from at least one analysis. If your paper does not include a tree, please submit a generic neighbor joining tree to satisfy this requirement.<br /> + (3) The output tree of an analysis has taxon labels that do not match with the input matrix (i.e. there are taxon labels in the tree that are missing from the matrix or matrices that produced the tree). Preparing your submission using <a href='http://mesquiteproject.org/'>Mesquite</a>, in which both matrices and trees are part of the same Mesquite project and share a common taxon block, will avoid the problem of mismatched taxon labels.<br /> + (4) The submitter has not attempted to validate the taxon labels by clicking the "Validate Taxon Labels" button in the Taxa section. +</p> +<p> + <input type="submit" name="Submit" value="Submit" id="submitReadyState"/> + <input type="submit" name="_cancel" value = "Cancel"/> +</p> </form> \ No newline at end of file Modified: trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js =================================================================== --- trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-26 00:28:51 UTC (rev 806) +++ trunk/treebase-web/src/main/webapp/scripts/user/submissionSummary.js 2011-04-26 15:53:43 UTC (rev 807) @@ -142,7 +142,7 @@ if ( TreeBASE.study && TreeBASE.study.analyses ) { writeAnalyses(); writeNexusFileNames(); - decorateNotes(); + //decorateNotes(); decorateCitation(); decorateAuthors(); decorateUpload(); @@ -247,6 +247,44 @@ citationLi.addClassName('notAnalyzed'); citationLi.select('a.Citation')[0].title = 'No citation information has been entered yet'; } + else { + var isCitationError = false; + var citationErrorMessage = ''; + switch( TreeBASE.study.citation.citationType ){ + case 'Article': + if ( TreeBASE.study.citation.journal.length == 0 ) { + isCitationError = true; + citationErrorMessage = 'No journal name has been entered'; + } + break + case 'Book': + if ( TreeBASE.study.citation.booktitle.length == 0 ) { + isCitationError = true; + citationErrorMessage = 'No book title has been entered'; + } + break + case 'Book Section': + if (TreeBASE.study.citation.booktitle.length == 0) { + isCitationError = true; + citationErrorMessage = 'No book title has been entered'; + } + if (TreeBASE.study.citation.sectiontitle.length == 0) { + if ( isCitationError ) { + citationErrorMessage += '; '; + } + isCitationError = true; + citationErrorMessage += 'No book section has been entered'; + } + break + } + + if ( isCitationError ){ + var citationLi = $('menuList').select('li.Citation')[0]; + citationLi.addClassName('notAnalyzed'); + citationLi.select('a.Citation')[0].title = citationErrorMessage; + } + } + } function decorateAuthors() { if ( TreeBASE.study.authors.length == 0 ) { @@ -352,7 +390,7 @@ ul = createUnorderedList(taxonLabels,'taxonLabel','taxonLabel'); ul.style.display = 'none'; taxaLi.appendChild(ul); - var taxonLabelLis = ul.select('li'); + /*var taxonLabelLis = ul.select('li'); var analyzed = 'analyzed'; for ( var i = 0; i < taxonLabelLis.length; i++ ) { var id = taxonLabelLis[i].id; @@ -369,7 +407,7 @@ taxaLi.addClassName(analyzed); if ( analyzed == 'notAnalyzed' ) { taxaLi.select('a.Taxa')[0].title = 'Some taxa have not been linked to external taxonomy yet'; - } + }*/ } else { taxaLi.addClassName('emptyList'); @@ -466,4 +504,13 @@ }); TreeBASE.register(initializeMenus); })() + +var submitButton = $('submitReadyState'); +if (submitButton != null && submitButton != undefined) { + var notAnalyzed = $$('li.notAnalyzed'); + if (notAnalyzed != null && notAnalyzed != undefined) { + submitButton.disable(); + $$('p.readyStateError').invoke('setStyle', { display: 'block' }); + } +}; /* end of closure */ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-26 00:28:57
|
Revision: 806 http://treebase.svn.sourceforge.net/treebase/?rev=806&view=rev Author: rvos Date: 2011-04-26 00:28:51 +0000 (Tue, 26 Apr 2011) Log Message: ----------- Added documentation. Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-25 22:45:37 UTC (rev 805) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-26 00:28:51 UTC (rev 806) @@ -16,19 +16,59 @@ import org.cipres.treebase.TreebaseIDString.MalformedTreebaseIDString; import org.cipres.treebase.web.Constants; +/** + * This class re-directs clients to one of a number of other controllers depending + * on the provided URL pattern. Here are the patterns. Where it says 'study' in the + * example patterns, it can equally say 'matrix', 'tree' or 'taxon'. The part that + * says 'TB2:S1787' is supposed to be a valid NamespacedGUID: + * <ul> + * <li> + * - /phylows/study/TB2:S1787 - this is the general pattern for stable resource + * URLs, without a query string. URLs of this kind are sent on to the AnyObjectAsRDFController. + * If you want to work on content-negotiation, go there. The re-direct URL is generated by + * the method createResourceUrl + * </li> + * + * <li> + * - /phylows/study/TB2:S1787?format=html - this is the pattern for the web page + * version of a resource. URLs of this kind are sent on to the SearchSummaryController, except + * for trees, which are sent to the SearchMapToPhyloWidgetController. The re-direct URL is + * generated by the method createDisplayUrl + * </li> + * + * <li> + * - /phylows/study/TB2:S1787?format=nexml - this is the pattern for any other available + * serialization of the resource (i.e. nexml|nexus|rdf). URLs of this kind are sent to the + * downloadA*Controller controller (e.g. Matrix|Study|Tree). If an output format isn't + * working as it should, look in the download controllers (and the core services that ultimately + * produce the output). The re-direct URL is generated by the method createDownloadUrl + * </li> + * + * <li> + * - /phylows/study/find?query=... - this is the pattern for search queries. URLs of this + * kind are sent to the *SearchController controllers (e.g. Matrix|Study|Tree). To debug + * CQL queries, look in those controllers, as the class you are looking at now doesn't + * process CQL at all. The re-direct URL is generated by the method createSearchUrl + * </li> + * </ul> + * @author rvosa + * + */ + public abstract class PhyloWSController implements Controller { private static final long serialVersionUID = 1L; private static String searchBase = "/treebase-web/search/"; /** - * + * Child classes return the display page for the focal type + * of objects, e.g. for matrices, this returns "matrix.html" * @return */ abstract String getDisplayPage(); /** * Given an object ID and a servlet request object, constructs - * a relative URL to an HTML page about that object. + * a relative URL to an HTML display page about that object. * @param objectId is the primary key for the requested object * @param request is the servlet request, which we need to check for reviewer access * @return a relative URL to an HTML page @@ -42,7 +82,8 @@ } /** - * + * Here the actual request is handled. See the class introduction at + * the top of this file for an overview of the logic implemented here. */ public ModelAndView handleRequest(HttpServletRequest req, HttpServletResponse res) throws IOException { String url = null; @@ -91,7 +132,9 @@ } /** - * + * Given a NamespacedGUID, which is a wrapper around an ID such as TB2:S1787, and + * a request object, returns a URL for the resource description of the object identified + * by the NamespacedGUID. * @param guid * @param req * @return @@ -114,13 +157,17 @@ } /** - * + * Child classes here return the search page; e.g. for matrices, returns "matrixSearch.html" * @return */ abstract String getSearchPage(); /** - * + * Constructs the URL that re-directs to the *SearchController classes. This involves: + * the getSearchPage() output (which identifies the seach controller), the CQL query, + * the output format (either rss1, or a web page in all other cases) and the recordSchema, + * which is used to project a search result set (e.g. a set of studies) into another class + * (e.g. the set of trees for those studies). * @param request * @return */ @@ -144,15 +191,21 @@ } /** - * Given an array of path fragments, returns whether an HTML web page - * exists for the type of object the fragments map onto + * Given an ID prefix (as per those of TreebaseIDString), returns whether an HTML web page + * exists for the type of object the prefix identifies * @param pathComponents * @return true of web page exists, false otherwise */ abstract boolean hasWebPage(String prefix); /** - * + * Child classes return a map of query string parameters and their values. Typically these + * are the study id (parameter name "id") and the id of an object in that study, e.g. + * a "matrixid" or a "treeid". In the latter cases where we look for objects in a study + * (not the study per se) we first need to look up those objects, and then fetch the study + * for them. Hence we need to interact with service objects, which potentially might not + * be able to find the object identified by objectId, hence we may throw an ObjectNotFoundException + * here. * @param objectId * @return * @throws ObjectNotFoundException @@ -160,7 +213,9 @@ abstract Map<String,String> getObjectQueryParameters(Long objectId) throws ObjectNotFoundException; /** - * + * Creates a URL by concatenating the base + ? + the params as query string parameters, i.e. + * key1=value1&key2=value2 + potentially the x-access-code parameter, when dealing with + * embargoed objects * @param base * @param params * @return @@ -183,13 +238,17 @@ /** - * + * Child classes return the focal download page here, e.g. for matrices, returns + * "downloadAMatrix.html" * @return */ abstract String getDownloadPage(); /** - * + * Creates the URL that re-directs to the DownloadA*Controllers. This involves concatenating + * getDownloadPage() with the query string parameters to identify the object to download, the + * format in which to serialize it (and potentially the x-access-code parameter, for + * embargoed objects). * @param objectId * @param format * @return @@ -204,7 +263,8 @@ } /** - * + * Exceptions of this kind are thrown when a non-existent objectId somehow ends up + * in a URL. * @author rvosa * */ Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java 2011-04-25 22:45:37 UTC (rev 805) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java 2011-04-26 00:28:51 UTC (rev 806) @@ -11,16 +11,28 @@ private MatrixService mMatrixService; + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getSearchPage() + */ @Override String getSearchPage() { return "matrixSearch.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDownloadPage() + */ @Override String getDownloadPage() { return "downloadAMatrix.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getObjectQueryParameters(java.lang.Long) + */ @Override Map<String,String> getObjectQueryParameters(Long objectId) throws ObjectNotFoundException { Matrix matrix = getMatrixService().findByID(objectId); @@ -37,11 +49,19 @@ return params; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDisplayPage() + */ @Override String getDisplayPage() { return "matrix.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#hasWebPage(java.lang.String) + */ @Override boolean hasWebPage(String prefix) { return "M".equals(prefix); Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java 2011-04-25 22:45:37 UTC (rev 805) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java 2011-04-26 00:28:51 UTC (rev 806) @@ -10,16 +10,28 @@ private StudyService mStudyService; + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getSearchPage() + */ @Override String getSearchPage() { return "studySearch.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDownloadPage() + */ @Override String getDownloadPage() { return "downloadAStudy.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getObjectQueryParameters(java.lang.Long) + */ @Override Map<String,String> getObjectQueryParameters(Long objectId) throws ObjectNotFoundException { Study study = getStudyService().findByID(objectId); @@ -31,11 +43,19 @@ return params; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDisplayPage() + */ @Override String getDisplayPage() { return "summary.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#hasWebPage(java.lang.String) + */ @Override boolean hasWebPage(String prefix) { return "S".equals(prefix); Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java 2011-04-25 22:45:37 UTC (rev 805) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java 2011-04-26 00:28:51 UTC (rev 806) @@ -5,28 +5,48 @@ public class PhyloWSTaxonController extends PhyloWSController { + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getSearchPage() + */ @Override String getSearchPage() { return "taxonSearch.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDownloadPage() + */ @Override String getDownloadPage() { return "downloadATaxon.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getObjectQueryParameters(java.lang.Long) + */ @Override Map<String,String> getObjectQueryParameters(Long objectId) throws ObjectNotFoundException { // TODO Auto-generated method stub return new HashMap<String,String>(); } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDisplayPage() + */ @Override String getDisplayPage() { // TODO Auto-generated method stub return "taxon.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#hasWebPage(java.lang.String) + */ @Override boolean hasWebPage(String prefix) { return false; Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java 2011-04-25 22:45:37 UTC (rev 805) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java 2011-04-26 00:28:51 UTC (rev 806) @@ -11,16 +11,28 @@ private PhyloTreeService mPhyloTreeService; + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getSearchPage() + */ @Override String getSearchPage() { return "treeSearch.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDownloadPage() + */ @Override String getDownloadPage() { return "downloadATree.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getObjectQueryParameters(java.lang.Long) + */ @Override Map<String,String> getObjectQueryParameters(Long objectId) throws ObjectNotFoundException { PhyloTree phyloTree = getPhyloTreeService().findByID(objectId); @@ -37,11 +49,19 @@ return params; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#getDisplayPage() + */ @Override String getDisplayPage() { return "tree.html"; } + /* + * (non-Javadoc) + * @see org.cipres.treebase.web.controllers.PhyloWSController#hasWebPage(java.lang.String) + */ @Override boolean hasWebPage(String prefix) { return "Tr".equals(prefix); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-25 22:45:43
|
Revision: 805 http://treebase.svn.sourceforge.net/treebase/?rev=805&view=rev Author: rvos Date: 2011-04-25 22:45:37 +0000 (Mon, 25 Apr 2011) Log Message: ----------- Changed hasWebPage method to use type prefix instead of class (which perhaps needs to be coerced first?) Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-25 22:27:59 UTC (rev 804) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-25 22:45:37 UTC (rev 805) @@ -58,7 +58,7 @@ NamespacedGUID namespacedGUID = new NamespacedGUID(substr); TreebaseIDString tbID = namespacedGUID.getTreebaseIDString(); String serializationFormat = createSerializationFormat(req); - if ( hasWebPage(tbID.getClass()) && ! TreebaseUtil.isEmpty(serializationFormat) ) { + if ( hasWebPage(tbID.getTypePrefix()) && ! TreebaseUtil.isEmpty(serializationFormat) ) { // output format is html, re-direct to display services if ( serializationFormat.equals("html") ) { @@ -149,7 +149,7 @@ * @param pathComponents * @return true of web page exists, false otherwise */ - abstract boolean hasWebPage(Class<?> theClass); + abstract boolean hasWebPage(String prefix); /** * Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java 2011-04-25 22:27:59 UTC (rev 804) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSMatrixController.java 2011-04-25 22:45:37 UTC (rev 805) @@ -43,8 +43,8 @@ } @Override - boolean hasWebPage(Class<?> theClass) { - return Matrix.class.isAssignableFrom(theClass); + boolean hasWebPage(String prefix) { + return "M".equals(prefix); } public MatrixService getMatrixService() { Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java 2011-04-25 22:27:59 UTC (rev 804) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSStudyController.java 2011-04-25 22:45:37 UTC (rev 805) @@ -37,8 +37,8 @@ } @Override - boolean hasWebPage(Class<?> theClass) { - return Study.class.isAssignableFrom(theClass); + boolean hasWebPage(String prefix) { + return "S".equals(prefix); } public StudyService getStudyService() { Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java 2011-04-25 22:27:59 UTC (rev 804) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTaxonController.java 2011-04-25 22:45:37 UTC (rev 805) @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.Map; -import org.cipres.treebase.domain.taxon.TaxonLabel; - public class PhyloWSTaxonController extends PhyloWSController { @Override @@ -30,8 +28,8 @@ } @Override - boolean hasWebPage(Class<?> theClass) { - return TaxonLabel.class.isAssignableFrom(theClass); + boolean hasWebPage(String prefix) { + return false; } } Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java 2011-04-25 22:27:59 UTC (rev 804) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSTreeController.java 2011-04-25 22:45:37 UTC (rev 805) @@ -43,8 +43,8 @@ } @Override - boolean hasWebPage(Class<?> theClass) { - return PhyloTree.class.isAssignableFrom(theClass); + boolean hasWebPage(String prefix) { + return "Tr".equals(prefix); } public PhyloTreeService getPhyloTreeService() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2011-04-25 22:28:05
|
Revision: 804 http://treebase.svn.sourceforge.net/treebase/?rev=804&view=rev Author: rvos Date: 2011-04-25 22:27:59 +0000 (Mon, 25 Apr 2011) Log Message: ----------- More pre-processing of the id string Modified Paths: -------------- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java =================================================================== --- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-25 22:15:19 UTC (rev 803) +++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/PhyloWSController.java 2011-04-25 22:27:59 UTC (rev 804) @@ -53,8 +53,9 @@ url = createSearchUrl(req); } else { + String substr = pathInfo.replaceAll(".*/", ""); try { - NamespacedGUID namespacedGUID = new NamespacedGUID(pathInfo); + NamespacedGUID namespacedGUID = new NamespacedGUID(substr); TreebaseIDString tbID = namespacedGUID.getTreebaseIDString(); String serializationFormat = createSerializationFormat(req); if ( hasWebPage(tbID.getClass()) && ! TreebaseUtil.isEmpty(serializationFormat) ) { @@ -75,7 +76,7 @@ url = createResourceUrl(namespacedGUID, req); } } catch ( MalformedTreebaseIDString e ) { - res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string from path info '" + pathInfo + "' message: " + e.getMessage()); + res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad ID string from path info '" + substr + "' message: " + e.getMessage()); } catch ( ObjectNotFoundException e ) { res.sendError(HttpServletResponse.SC_NOT_FOUND, "Object not found: " + e.getMessage()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |