Révision 3090

tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 3090)
265 265 
					query = query.substring(0, query.length() - 1);
266 266
267 267 
					query += "\""; //$NON-NLS-1$
268
268
269 269 
				}
270 270 
				else if (props.get(p) instanceof WordProperty) {
271 271 
					ArrayList<String> values = new ArrayList<>();
......
275 275 
						values.add(s);
276 276 
					}
277 277
278 
					String test = ((WordProperty)props.get(p)).getCQLTest(values);
278 
					String test = ((WordProperty) props.get(p)).getCQLTest(values);
279 279 
					if (test != null) {
280 280 
						query += test;
281 281 
					}
282 282 
				}
283 283
284 
				if (p < nbProps-1) {
284 
				if (p < nbProps - 1) {
285 285 
					query += " & "; //$NON-NLS-1$
286 286 
				}
287 287 
			}
......
314 314 
					if (props.get(p) instanceof WordProperty) {
315 315 
						String s = line.getUnitsProperties().get(p).get(t);
316 316
317 
						String test = ((WordProperty)props.get(p)).getCQLTest(s);
317 
						String test = ((WordProperty) props.get(p)).getCQLTest(s);
318 318 
						if (test != null) {
319 319 
							query += test;
320 320 
						}
321 321 
					}
322
323 
					if (p < nbProps -1) {
322
323 
					if (p < nbProps - 1) {
324 324 
						query += " & "; //$NON-NLS-1$
325 325 
					}
326 326 
				}
......
396 396 
			this.saveParameter(TXMPreferences.QUERY, pQuery.getQueryString());
397 397 
		}
398 398
399
400 399 
		return true;
401 400 
	}
402 401
......
614 613 
						strs = CorpusManager.getCorpusManager().getCqiClient().struc2Str(property.getQualifiedName(), indices);
615 614 
					}
616 615 
					else if (property instanceof WordProperty) {
617 
						strs = ((WordProperty)property).id2Str(indices);
616 
						strs = ((WordProperty) property).id2Str(indices);
618 617 
					}
619 618 
				}
620 619 
				catch (Exception e) {
......
735 734
736 735 
	@Override
737 736 
	public String getComputingStartMessage() {
738 
		return TXMCoreMessages.bind(IndexCoreMessages.indexOfP0PropertiesP1InTheP2Corpus, (this.pQuery!=null?this.pQuery.asString():"<no query>"), WordProperty.asString(this.pProperties), this.getCorpus().getName());
737 
		return TXMCoreMessages.bind(IndexCoreMessages.indexOfP0PropertiesP1InTheP2Corpus, (this.pQuery != null ? this.pQuery.asString() : "<no query>"), WordProperty.asString(this.pProperties), this
738 
				.getCorpus().getName());
739 739 
	}
740 740
741 741
......
852 852 
					propsId.put(property, structs);
853 853 
				}
854 854 
				else if (property instanceof WordProperty) {
855 
					int[] indices = ((WordProperty)property).cpos2Id(allpositionsarray);
855 
					int[] indices = ((WordProperty) property).cpos2Id(allpositionsarray);
856 856 
					propsId.put(property, indices);
857 857 
				}
858 858 
			}

Formats disponibles : Unified diff