Révision 745

tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java (revision 745)
177 177
		lines.clear();
178 178
		counts.clear();
179 179
		partnames.clear();
180

  
180
		currentpartid = 0;
181
		nTotalTokens = 0;
182
		
181 183
		if (parent instanceof Corpus && "[]".equals(pQuery.getQueryString()) &&  pProperties.size() == 1) {
182 184
			computeWithCorpusAndNoQuery(); // internally using a lexicon
183 185
		}
......
187 189
			if (parent instanceof Corpus) {
188 190

  
189 191
				Corpus corpus = (Corpus)parent;
190
				partnames.clear();
191 192
				partnames.add(corpus.getName());
192 193

  
193 194
				if (!scanCorpus(corpus)) {
......
203 204
			else if (parent instanceof Partition) {
204 205

  
205 206
				Partition partition = (Partition)parent;
206
				partnames.clear();
207 207
				for (Part part : partition.getParts()) {
208 208
					scanCorpus(part);
209 209
					currentpartid++;
......
487 487
		try {
488 488
			return this.pQuery.equals(index.getQuery())
489 489
					&& this.pProperties.equals(index.getProperties())
490
					&& this.pFminFilter == index.getFilterFmin() && this.pFmaxFilter == index.getFilterFmax();
490
					&& this.pFminFilter == index.getFilterFmin()
491
					&& this.pFmaxFilter == index.getFilterFmax();
491 492
		}
492 493
		catch(Exception e) {
493 494
		}
......
824 825
	}
825 826

  
826 827
	/**
827
	 * Gets the number of tokens found
828
	 * Gets the number of tokens found.
828 829
	 *
829 830
	 * @return the number of tokens returned by the selection
830 831
	 */
......
843 844
	/**
844 845
	 * Gets the v.
845 846
	 *
846
	 * @return the number of entrie in the index
847
	 * @return the number of entries in the index
847 848
	 */
848 849
	public int getV() {
849 850
		return lines.size();
tmp/org.txm.index.core/src/org/txm/index/core/functions/Line.java (revision 745)
42 42
public class Line {
43 43
	
44 44
	/** The Units property. */
45
	public List<List<String>> UnitsProperty; // the values, for each property
46
												// there is a list of property
47
												// values
45
	public List<List<String>> UnitsProperty; // the values, for each property there is a list of property values
46
	
48 47
	/** The Units ids. */
49
												public List<int[]> UnitsIds; // the values, for each property there is a
50
									// list of property values
48
	public List<int[]> UnitsIds; // the values, for each property there is a list of property values
49
	
51 50
	/** The properties. */
52
									public List<Property> properties = new ArrayList<Property>(); // the
53
																	// properties
54
																	// name
55
	// UnitsProperty and properties have the same order
51
	public List<Property> properties = new ArrayList<Property>(); // the properties name UnitsProperty and properties have the same order
52
	
56 53
	/** The signature. */
57
																	private String signature;
54
	private String signature;
58 55
	
59 56
	/** The counts. */
60 57
	private int[] counts;
tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java (revision 745)
529 529
			if (partnames.size() > 1)
530 530
				if (viewer.getTable().getColumnCount() < partnames.size() + 3) {
531 531
					for (int i = 0; i < partnames.size(); i++) {
532
						final TableColumn partColumn = new TableColumn(
533
								viewer.getTable(), SWT.RIGHT);
532
						final TableColumn partColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
534 533
						try {
535
							partColumn.setText(partnames.get(i)+" t="+index.getPartition().getParts().get(i).getSize()); //$NON-NLS-1$
534
							partColumn.setText(partnames.get(i) + " t=" + index.getPartition().getParts().get(i).getSize()); //$NON-NLS-1$
536 535
						} catch (CqiClientException e1) {
537 536
							org.txm.rcp.utils.Logger.printStackTrace(e1);
538 537
						}
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 745)
687 687
	 */
688 688
	public void saveParameter(String key, Object value)	{
689 689
		// FIXME: debug
690
		Log.info("TXMResult.saveParameter(): saving parameter " + key + " = " + value + " for " + this.getClass() + " (" + value.getClass() + ") to node.");
690
		//Log.info("TXMResult.saveParameter(): saving parameter " + key + " = " + value + " for " + this.getClass() + " (" + value.getClass() + ") to node.");
691 691

  
692 692
		TXMPreferences.putLocal(this, key, value);
693 693
	}
......
887 887
			targetField.setAccessible(true);
888 888

  
889 889
			// FIXME: debug
890
			if(value != null)	{
891
				Log.info("TXMResult.setParameter(): setting parameter " + key + " = " + value + " for " + this.getClass() + " (" + value.getClass() + ")");
892
			}
890
//			if(value != null)	{
891
//				Log.info("TXMResult.setParameter(): setting parameter " + key + " = " + value + " for " + this.getClass() + " (" + value.getClass() + ")");
892
//			}
893 893

  
894 894
			targetField.set(this, value);
895 895
		}
......
1503 1503
			skipComputing = true;
1504 1504
		}
1505 1505

  
1506
		if (!this.isDirty()) {
1506
		else if (!this.isDirty()) {
1507 1507

  
1508 1508
			// FIXME: Debug
1509 1509
			System.err.println("TXMResult.compute(): " + this.getClass().getSimpleName() + ": result is not dirty, computing skipped.");

Formats disponibles : Unified diff