Revision 44369

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.jdbc/src/main/java/org/gvsig/fmap/dal/store/jdbc2/spi/operations/ResultSetForSetProviderOperation.java
192 192
            sqlbuilder.select().offset(offset);
193 193
        }
194 194
        sqlbuilder.setProperties(
195
                Variable.class, 
195
                null, 
196 196
                PROP_FEATURE_TYPE, this.storeType,
197 197
                PROP_TABLE, table
198 198
        );
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/IntersectsEnvelopeEvaluator.java
89 89
    @Override
90 90
    public String getSQL() {
91 91
        ExpressionBuilder.Variable column = builder.column(fad.getName());
92
        IProjection theProjection = this.projection;
93
        if( this.fad.getSRS()==null ) {
94
            theProjection = null;
95
        }
92 96
        return builder.set(
93 97
                builder.and(
94 98
                    builder.not_is_null(column)    ,
95 99
                    builder.ST_Intersects(
96
                            builder.ST_Envelope(column),
97
                            builder.geometry(envelope.getGeometry(), this.projection)
100
                            column,
101
                            builder.geometry(envelope.getGeometry(), theProjection)
98 102
                    )
99 103
                )
100 104
        ).toString();
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/ExpressionBuilder.java
253 253

  
254 254
        @Override
255 255
        public boolean accept(Visitable visitable) {
256
            if( classFilter==null ) {
257
                return true;
258
            }
256 259
            return classFilter.isInstance(visitable);
257 260
        }
258 261

  

Also available in: Unified diff