Revision 46748 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 | ||
---|---|---|
129 | 129 |
super(); |
130 | 130 |
this.useSubquery = true; // true for backwards compatibility. |
131 | 131 |
this.limit = NO_LIMIT; |
132 |
this.pageSize = 0; |
|
132 | 133 |
} |
133 | 134 |
|
134 | 135 |
public DefaultFeatureQuery(String storeName) { |
... | ... | |
370 | 371 |
@Override |
371 | 372 |
public Evaluator getFilter() { |
372 | 373 |
if( this.filter instanceof ExpressionEvaluator ) { |
373 |
ExpressionEvaluator ee = (ExpressionEvaluator) this.filter; |
|
374 |
ee.addSymbolTable(symbolTable); |
|
374 |
ExpressionEvaluator eefilter = (ExpressionEvaluator) this.filter; |
|
375 |
if( symbolTable != null ) { |
|
376 |
eefilter.addSymbolTable(symbolTable); |
|
377 |
} |
|
375 | 378 |
} |
376 | 379 |
return filter; |
377 | 380 |
} |
... | ... | |
379 | 382 |
@Override |
380 | 383 |
public Expression getExpressionFilter() { |
381 | 384 |
if( this.filter instanceof ExpressionEvaluator ) { |
382 |
ExpressionEvaluator ee = (ExpressionEvaluator) this.filter; |
|
383 |
ee.addSymbolTable(symbolTable); |
|
384 |
return ee.toExpression(); |
|
385 |
ExpressionEvaluator eefilter = (ExpressionEvaluator) this.filter; |
|
386 |
if( symbolTable != null ) { |
|
387 |
eefilter.addSymbolTable(symbolTable); |
|
388 |
} |
|
389 |
return eefilter.toExpression(); |
|
385 | 390 |
} |
386 | 391 |
return null; |
387 | 392 |
} |
... | ... | |
919 | 924 |
return this.groupByColumns != null && !this.groupByColumns.isEmpty(); |
920 | 925 |
} |
921 | 926 |
|
927 |
private void clear() { |
|
928 |
this.queryParameters = new HashMap(); |
|
929 |
|
|
930 |
// this.featureTypeId = other.featureTypeId; |
|
931 |
// this.storeName = other.storeName; |
|
932 |
|
|
933 |
this.clearConstantsAttributeNames(); |
|
934 |
this.clearAttributeNames(); |
|
935 |
this.clearFilter(); |
|
936 |
this.clearLimit(); |
|
937 |
this.setOrder(null); |
|
938 |
this.useSubquery = true; // true for backwards compatibility. |
|
939 |
this.limit = NO_LIMIT; |
|
940 |
this.pageSize = 0; |
|
941 |
this.groupByColumns = null; |
|
942 |
this.aggregateFunctions=null; |
|
943 |
this.extraColumns = new DefaultFeatureExtraColumns(); |
|
944 |
this.symbolTable = null; |
|
945 |
|
|
946 |
} |
|
947 |
|
|
922 | 948 |
@Override |
923 | 949 |
public void copyFrom(FeatureQuery query) { |
950 |
if( query == null ) { |
|
951 |
this.clear(); |
|
952 |
return; |
|
953 |
} |
|
924 | 954 |
DefaultFeatureQuery other = (DefaultFeatureQuery) query; |
925 | 955 |
this.queryParameters = new HashMap(); |
926 | 956 |
this.queryParameters.putAll(other.queryParameters); |
Also available in: Unified diff