Revision 24002

View differences:

trunk/extensions/extSymbology/src/org/gvsig/symbology/fmap/labeling/FeatureDependentLabeled.java
139 139

  
140 140
	public IFeatureIterator getFeatureIteratorByLabelClass(FLyrVect layer, LabelClass lc, ViewPort viewPort, String[] usedFields)
141 141
	throws ReadDriverException {
142
//		if(lc.isUseSqlQuery()){
143
		String sqlFields = "";
144
		for (int i = 0; i < usedFields.length; i++) {
145
			sqlFields += usedFields[i];
146
			if (i < usedFields.length -1) sqlFields += ", ";
147
		}
148
		String fieldNames[] = layer.getSource().getRecordset().getFieldNames();
149
		StringBuilder sql = new StringBuilder();
150
		sql.append("select ");
151
		for (int i=0; i<fieldNames.length-1; i++) {
152
			sql.append(fieldNames[i]);
153
			sql.append(",");
154
		}
155
		sql.append(fieldNames[fieldNames.length-1]);
156
		sql.append(" from ");
157
		sql.append(layer.getRecordset().getName());
142 158
		if(lc.isUseSqlQuery()){
143
			String sqlFields = "";
144
			for (int i = 0; i < usedFields.length; i++) {
145
				sqlFields += usedFields[i];
146
				if (i < usedFields.length -1) sqlFields += ", ";
147
			}
148
			String fieldNames[] = layer.getSource().getRecordset().getFieldNames();
149
			StringBuilder sql = new StringBuilder();
150
			sql.append("select ");
151
			for (int i=0; i<fieldNames.length-1; i++) {
152
				sql.append(fieldNames[i]);
153
				sql.append(",");
154
			}
155
			sql.append(fieldNames[fieldNames.length-1]);
156
			sql.append(" from ");
157
			sql.append(layer.getRecordset().getName());
158 159
			sql.append(" where ");
159 160
			sql.append(lc.getSQLQuery());
160
			sql.append(";");
161
			return layer.getSource().getFeatureIterator(sql.toString(), layer.getProjection());
162 161
		}
163
		else {
164
			return layer.getSource().getFeatureIterator(
165
					viewPort.getAdjustedExtent(), usedFields,
166
					layer.getProjection(), true);
167
		}
162
		sql.append(";");
163
		return layer.getSource().getFeatureIterator(sql.toString(), layer.getProjection());
164
//		}
165
//		else {
166
//			return layer.getSource().getFeatureIterator(
167
//					viewPort.getAdjustedExtent(), usedFields,
168
//					layer.getProjection(), true);
169
//		}
168 170
	}
169 171

  
170 172
	public boolean definesPriorities() {

Also available in: Unified diff