/ - Diff - | gvSIG desktop 1 - gvSIG

branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/gui/selectionByTheme/MySelectionByThemeListener.java
313	313	public String getName() {
314	314	return "select by theme";
315	315	}
316		public String getCQL() {
	316
	317	public String getSQL() {
317	318	// TODO Auto-generated method stub
318	319	return null;
319	320	}

branches/v2_0_0_prep/libraries/libEvaluator_SQLJEP/src/org/gvsig/tools/evaluator/sqljep/SQLJEPEvaluator.java
27	27	return "SQLJEP(" + expresion + ")";
28	28	}
29	29
30		public String getCQL() {
	30	public String getSQL() {
31	31	return expresion;
32	32	}
33	33

branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/feature/BaseTestFeatureStore.java
653	653	return Boolean.TRUE;
654	654	}
655	655
656		public String getCQL() {
	656	public String getSQL() {
657	657	return "true = true";
658	658	}
659	659

branches/v2_0_0_prep/libraries/libFMap_dal/src-test/org/gvsig/fmap/dal/feature/BaseTestEditableFeatureStore.java
97	97	return value.toLowerCase();
98	98	}
99	99
100		public String getCQL() {
	100	public String getSQL() {
101	101	return null;
102	102	}
103	103
...	...
127	127	return value.toUpperCase();
128	128	}
129	129
130		public String getCQL() {
	130	public String getSQL() {
131	131	return null;
132	132	}
133	133

branches/v2_0_0_prep/libraries/libFMap_daldb/src-test/org/gvsig/fmap/dal/store/postgresql/TestPostgreSQL.java
117	117	return Boolean.TRUE;
118	118	}
119	119
120		public String getCQL() {
	120	public String getSQL() {
121	121	return "true = true";
122	122	}
123	123

branches/v2_0_0_prep/libraries/libFMap_daldb/src-test/org/gvsig/fmap/dal/store/postgresql/TestPostgreSQLWrite.java
130	130	return Boolean.TRUE;
131	131	}
132	132
133		public String getCQL() {
	133	public String getSQL() {
134	134	return "true = true";
135	135	}
136	136

     			return null;
+    		}
     		EvaluatorFieldsInfo info = filter.getFieldsInfo();
     		String filterString = filter.getCQL();
     		String filterString = filter.getSQL();
     		if (info == null) {
     			return filterString;
+    		}
-...
     	public boolean canFilter() {
     		Evaluator filter = getQuery().getFilter();
     		if (filter != null) {
     			if (filter.getCQL() == null || filter.getCQL().length() == 0) {
     			if (filter.getSQL() == null || filter.getSQL().length() == 0) {
     				return false;
     			} else {
     				// TODO Check Geom fields if
-...
     		if (query.hasOrder()) {
     			Iterator iter = query.getOrder().iterator();
     			FeatureQueryOrderMember menber;
     			String cql;
     			String sql;
     			while (iter.hasNext()){
     				menber = (FeatureQueryOrderMember) iter.next();
     				if (menber.hasEvaluator()){
     					cql =menber.getEvaluator().getCQL();
     					if (cql == null || cql.length() == 0) {
     					sql = menber.getEvaluator().getSQL();
     					if (sql == null || sql.length() == 0) {
     						return false;
+    					}
+    				}

     		return "equals with geometry";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (geometryWKT == null) {
     			try {
     				geometryWKT = (String) geometry.invokeOperation(ToWKT.CODE,

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/OverlapsGeometryEvaluator.java
68	68	return "overlaps with geometry";
69	69	}
70	70
71		public String getCQL() {
	71	public String getSQL() {
72	72	return " overlaps(GeomFromText('" + geometry.toString() + "', " + "'"
73	73	+ srs + "'" + "), " + geomName + ") ";
74	74	}

     		return "contains in envelope";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (envelopeWKT == null) {
     			try {
     				envelopeWKT = (String) envelope.getGeometry().invokeOperation(

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/WithinGeometryEvaluator.java
68	68	return "within with geometry";
69	69	}
70	70
71		public String getCQL() {
	71	public String getSQL() {
72	72	return " within(GeomFromText('" + geometry.toString() + "', " + "'"
73	73	+ srs + "'" + "), " + geomName + ") ";
74	74	}

     		return "intersets in envelope";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (envelopeWKT == null) {

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/OutGeometryEvaluator.java
68	68	return "out of geometry";
69	69	}
70	70
71		public String getCQL() {
	71	public String getSQL() {
72	72	return " not contains(GeomFromText('" + geometry.toString() + "', " + "'"
73	73	+ srs + "'" + "), " + geomName + ") ";
74	74	}

branches/v2_0_0_prep/libraries/libFMap_mapcontext/src/org/gvsig/fmap/mapcontext/layers/vectorial/TouchesGeometryEvaluator.java
68	68	return "touches with geometry";
69	69	}
70	70
71		public String getCQL() {
	71	public String getSQL() {
72	72	return " touches(GeomFromText('" + geometry.toString() + "', " + "'"
73	73	+ srs + "'" + "), " + geomName + ") ";
74	74	}

     		return "contains in envelope";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (envelopeWKT == null) {
     			try {
     				envelopeWKT = (String) envelope.getGeometry().invokeOperation(

     		return "contains with geometry";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (geometryWKT == null) {
     			try {
     				geometryWKT = (String) geometry.invokeOperation(ToWKT.CODE,

     		return "crosses with geometry";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (geometryWKT == null) {
     			try {
     				geometryWKT = (String) geometry.invokeOperation(ToWKT.CODE,

     		return "disjoint with geometry";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (geometryWKT == null) {
     			try {
     				geometryWKT = (String) geometry.invokeOperation(ToWKT.CODE,

     		return "intersects with geometry";
+    	}
     	public String getCQL() {
     	public String getSQL() {
     		if (geometryWKT == null) {
     			try {
     				geometryWKT = (String) geometry.invokeOperation(ToWKT.CODE,

     		private String attribute;
     		private Object value;
     		private String cql;
     		private String sql;
     		private EvaluatorFieldsInfo info = null;
     		//		private int attributeIndex;
-...
     		public void updateValue(Object value) {
     			this.value = value;
     			this.cql = this.attribute + "= '" + this.value + "'";
     			this.sql = this.attribute + "= '" + this.value + "'";
     			this.info = new EvaluatorFieldsInfo();
     			this.info.addMatchFieldValue(this.attribute, value);
+    		}
-...
     			return new Boolean(curValue.equals(value));
+    		}
     		public String getCQL() {
     			return this.cql;
     		public String getSQL() {
     			return this.sql;
+    		}
     		public String getDescription() {

     		private String attribute;
     		private Object value;
     		private String cql;
     		private String sql;
     		private EvaluatorFieldsInfo info = null;
     		//		private int attributeIndex;
-...
     		public void updateValue(Object value) {
     			this.value = value;
     			this.cql = this.attribute + "= '" + this.value + "'";
     			this.sql = this.attribute + "= '" + this.value + "'";
     			this.info = new EvaluatorFieldsInfo();
     			this.info.addMatchFieldValue(this.attribute, value);
+    		}
-...
     			return curValue.equals(value);
+    		}
     		public String getCQL() {
     			return this.cql;
     		public String getSQL() {
     			return this.sql;
+    		}
     		public String getDescription() {

branches/v2_0_0_prep/extensions/extDataLocator/src/org/gvsig/datalocator/gui/DataSelectionPanel.java
761	761	return new Boolean(false);
762	762	}
763	763
764		public String getCQL() {
	764	public String getSQL() {
765	765	return name + " is not null;";
766	766	}
767	767

| gvSIG desktop 1