Revision 46540 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureQuery.java
| DefaultFeatureQuery.java | ||
|---|---|---|
| 25 | 25 |
|
| 26 | 26 |
import java.util.ArrayList; |
| 27 | 27 |
import java.util.HashMap; |
| 28 |
import java.util.Iterator; |
|
| 28 | 29 |
import java.util.List; |
| 29 | 30 |
import java.util.Map; |
| 30 | 31 |
import java.util.logging.Level; |
| ... | ... | |
| 859 | 860 |
if( this.aggregateFunctions == null ) {
|
| 860 | 861 |
return; |
| 861 | 862 |
} |
| 862 |
this.aggregateFunctions.remove(colname); |
|
| 863 |
for (Iterator<Map.Entry<String, String>> iterator = this.getAggregateFunctions().entrySet().iterator(); iterator.hasNext();) {
|
|
| 864 |
Map.Entry<String, String> entry = iterator.next(); |
|
| 865 |
String attrName = entry.getKey(); |
|
| 866 |
String function = entry.getValue(); |
|
| 867 |
if(StringUtils.equalsIgnoreCase(colname, attrName)){
|
|
| 868 |
iterator.remove(); |
|
| 869 |
return; |
|
| 870 |
} |
|
| 871 |
} |
|
| 863 | 872 |
} |
| 864 | 873 |
|
| 865 | 874 |
@Override |
| 875 |
public String getAggregateFunction(String name){
|
|
| 876 |
for (Map.Entry<String, String> entry : this.getAggregateFunctions().entrySet()) {
|
|
| 877 |
String attrName = entry.getKey(); |
|
| 878 |
String function = entry.getValue(); |
|
| 879 |
if(StringUtils.equalsIgnoreCase(name, attrName)){
|
|
| 880 |
return function; |
|
| 881 |
} |
|
| 882 |
} |
|
| 883 |
return null; |
|
| 884 |
} |
|
| 885 |
|
|
| 886 |
@Override |
|
| 866 | 887 |
public String getAggregate(String name) {
|
| 867 |
String fn = this.getAggregateFunctions().get(name);
|
|
| 888 |
String fn = this.getAggregateFunction(name); |
|
| 868 | 889 |
if( StringUtils.isAlphanumeric(fn) ) {
|
| 869 | 890 |
return fn + "(\""+ name + "\")"; |
| 870 | 891 |
} |
| ... | ... | |
| 873 | 894 |
|
| 874 | 895 |
@Override |
| 875 | 896 |
public String getAggregate(String tableName, String name) {
|
| 876 |
String fn = this.getAggregateFunctions().get(name);
|
|
| 897 |
String fn = this.getAggregateFunction(name); |
|
| 877 | 898 |
if (!tableName.startsWith("\"")) {
|
| 878 | 899 |
tableName = "\""+tableName+"\""; |
| 879 | 900 |
} |
| ... | ... | |
| 885 | 906 |
|
| 886 | 907 |
@Override |
| 887 | 908 |
public boolean isAggregate(String name) {
|
| 888 |
return this.getAggregateFunctions().get(name) != null;
|
|
| 909 |
return this.getAggregateFunction(name) != null; |
|
| 889 | 910 |
} |
| 890 | 911 |
|
| 891 | 912 |
@Override |
Also available in: Unified diff