Revision 4f7ccb87
Added by Patrick Plitzner over 7 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java | ||
|---|---|---|
| 59 | 59 |
return generateQueryDelegate(SELECT_QUERY, COUNT_QUERY, CONTAINS_QUERY); |
| 60 | 60 |
} |
| 61 | 61 |
|
| 62 |
public static QueryDelegate generateTaxonDistributionQuery(List<String> termList, List<Integer> taxonNodeIds, List<String> namesAreaUuids) throws SQLException {
|
|
| 62 |
public static QueryDelegate generateTaxonDistributionQuery(List<Integer> taxonNodeIds, List<String> namedAreas) throws SQLException {
|
|
| 63 | 63 |
|
| 64 | 64 |
String idString = ""; |
| 65 | 65 |
Iterator<Integer> nodeIterator = taxonNodeIds.iterator(); |
| ... | ... | |
| 93 | 93 |
"tb.titleCache AS "+TAXON_COLUMN+", " + |
| 94 | 94 |
"rank.titleCache AS "+RANK_COLUMN+", "; |
| 95 | 95 |
|
| 96 |
for(String term : termList){
|
|
| 97 |
SELECT_QUERY += "MAX( IF(area.titleCache = '"+ term +"', statusTerm.titleCache, NULL) ) as '"+ term +"'," ;
|
|
| 96 |
for(String namedArea : namedAreas){
|
|
| 97 |
SELECT_QUERY += "MAX( IF(area.titleCache = '"+ namedArea +"', statusTerm.titleCache, NULL) ) as '"+ namedArea +"'," ;
|
|
| 98 | 98 |
} |
| 99 | 99 |
SELECT_QUERY = StringUtils.stripEnd(SELECT_QUERY, ",")+" "; |
| 100 | 100 |
SELECT_QUERY= SELECT_QUERY + FROM_QUERY + GROUP_BY + ORDER_BY; |
Also available in: Unified diff
ref #5458 Implement multi select for NamedArea selection