Project

General

Profile

« Previous | Next » 

Revision 10cc0e5e

Added by Cherian Mathew almost 9 years ago

NewTaxonBaseComposite : add exception handling when name already exists
StatusComposite : added tab sheet with main / excluded tabs
CdmQueryFactory, LeafNodeTaxonContainer : added rank filter for ranks below species aggregate
NewTaxonBasePresenter : added check if name exists
NewTaxonBasePresenterTest (.xml) : corrected data for valid names and added test for name check
CdmVaadinOperation : added method to set exception

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java
34 34 
            String has_syn_id) throws SQLException {
35 35 
        String FROM_QUERY = " FROM TaxonBase tb " +
36 36 
                "INNER JOIN TaxonNode tn on tn.taxon_id=tb.id " +
37 
                "INNER JOIN TaxonNameBase tnb on tb.name_id=tnb.id ";
37 
                "INNER JOIN TaxonNameBase tnb on tb.name_id=tnb.id " +
38 
                "INNER JOIN DefinedTermBase dtb on tnb.rank_id = dtb.id";
38 39 
        String SELECT_QUERY="SELECT tb.id as " + ID +
39 40 
                ", tb.uuid as " + UUID_ID +
40 41 
                ", tnb.titleCache as " + name_id +
41 42 
                ", tb.publish as " + pb_id +
42 43 
                ", tb.unplaced as " + unp_id +
44 
                ", dtb.titleCache as " + rank_id +
43 45 
                ", (SELECT COUNT(*) FROM  SynonymRelationship sr WHERE tb.id = sr.relatedto_id) as " + has_syn_id +
44 46 
                FROM_QUERY;
45 47 
        String COUNT_QUERY = "SELECT count(*) " + FROM_QUERY;

Also available in: Unified diff