Revision 45366 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/dataaccess/SelectCountFunction.java

View differences:

SelectCountFunction.java
34 34
import org.gvsig.fmap.dal.DataManager;
35 35
import static org.gvsig.fmap.dal.DataManager.FUNCTION_SELECT_COUNT;
36 36
import org.gvsig.fmap.dal.DataStore;
37
import org.gvsig.fmap.dal.expressionevaluator.ExpressionEvaluator;
37
import org.gvsig.expressionevaluator.ExpressionEvaluator;
38 38
import org.gvsig.fmap.dal.feature.FeatureQuery;
39 39
import org.gvsig.fmap.dal.feature.FeatureSet;
40 40
import org.gvsig.fmap.dal.feature.FeatureStore;
41
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultExpressionEvaluator;
41
import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureExpressionEvaluator;
42 42
import org.gvsig.tools.dispose.DisposeUtils;
43 43

  
44 44
/**
......
114 114
      } else {
115 115
          FeatureQuery query = featureStore.createFeatureQuery();
116 116
          Code where2 = removeOuterTablesReferences(interpreter, where);
117
          ExpressionEvaluator filter = new DefaultExpressionEvaluator(where2.toString());
118
          filter.getSymbolTable().addSymbolTable(interpreter.getSymbolTable());
117
          ExpressionEvaluator filter = new DefaultFeatureExpressionEvaluator(where2.toString());
118
          filter.toSymbolTable().addSymbolTable(interpreter.getSymbolTable());
119 119
          query.addFilter(filter);
120 120
          query.retrievesAllAttributes();
121 121
          set = featureStore.getFeatureSet(query);

Also available in: Unified diff