/ - Diff - Plateforme TXM - Forge du Centre Blaise Pascal

+    		}
     		HashMap<String, MainCorpus> corpora = CorpusManager.getCorpusManager().getCorpora();
     		if (corpora.get(this.pID) != null && corpora.get(this.pID) != this) {
     		if (CorpusManager.getCorpusManager().hasCorpus(this)) {
     			Log.severe(NLS.bind("** The \"{0}\" MainCorpus object in the \"{1}\" project can not be computed: another one with the same CQP identifier has already been computed.", this.pID, this.getProjectDirectory()));
     			return false;
+    		}
     		corpora.put(this.pID, this);
     		CorpusManager.getCorpusManager().add(this);
     		this.dataDirectory = new File(getProjectDirectory(), "data/"+getID());
     		this.registryFile = new File(getProjectDirectory(), "registry/"+getID().toLowerCase());
-...
+    			}
     			CQPSearchEngine.getCqiClient().load_a_system_corpus(this.registryFile.getParent(), this.pID);
     			corpora.put(this.pID, this); // register the corpus
     		} catch(Exception e) {
     			Log.severe("MainCorpus not loaded: "+e);
-...
     		return true;
+    	}
     	@Override
     	public void onProjectClose() {
     		try {
     			if (hasBeenComputedOnce && this.pID != null) {
     				CorpusManager.getCorpusManager().deleteCorpus(this);
+    			}
     		} catch (Exception e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
+    	}
     	/* (non-Javadoc)
     	 * @see org.txm.searchengine.cqp.corpus.Corpus#load()

     import static org.txm.searchengine.cqp.corpus.query.CqpQueryConstant.*;
     // TODO: Auto-generated Javadoc
     /**
      * A query that extract a part from a corpus.
      * A query that select a structured subcorpus from a corpus.
+     *
      * @author Jean Philippe Magué
      * @author sloiseau
-...
     public class QueryPart extends CQLQuery {
     	/** The structure. */
     	private StructuralUnit structure;
     	protected StructuralUnit structure;
     	/** The property. */
     	private StructuralUnitProperty property;
     	protected StructuralUnitProperty property;
     	/** The value. */
     	private String value;
     	protected String value;
     	/**
     	 * Instantiates a new query part.
-...
     		this.property = property;
     		this.value = value;
     		String tag = structure.getName() + TAG_ATTRIBUTE_SEPARATOR + property.getName();
     		String label = "a"; //$NON-NLS-1$
     		StringBuffer query = new StringBuffer();
     		query.append(REGION_MACRO + START_MACRO_ARGS);
     		query.append(tag + MACRO_ARGS_SEPARATOR + label + END_MACRO_ARGS);
     		query.append(START_GLOBAL_CONSTRAINT + label + DOT + tag + EQUALS
     				+ START_DOUBLE_QUOTE + value + END_DOUBLE_QUOTE);
     		queryString = query.toString();
     //		String tag = structure.getName() + TAG_ATTRIBUTE_SEPARATOR + property.getName();
     //		String label = "a"; //$NON-NLS-1$
     //		StringBuffer query = new StringBuffer();
     //		query.append(REGION_MACRO + START_MACRO_ARGS);
     //		query.append(tag + MACRO_ARGS_SEPARATOR + label + END_MACRO_ARGS);
     //		query.append(START_GLOBAL_CONSTRAINT + label + DOT + tag + EQUALS
     //				+ START_DOUBLE_QUOTE + value + END_DOUBLE_QUOTE);
     //		queryString = query.toString();
     		if ("text".equals(structure.getName())) { // optimisation only for the text structure
     			queryString = "<"+property.getFullName()+"=\""+CQLQuery.addBackSlash(value)+"\">[] expand to "+structure.getName();
     		} else {
     			queryString = "[_."+property.getFullName()+"=\""+CQLQuery.addBackSlash(value)+"\"] expand to "+structure.getName();
+    		}
+    	}
     	public StructuralUnit getStructure() {
     		return structure;
+    	}
     	public StructuralUnitProperty getProperty() {
     		return property;
+    	}
     	public String getValue() {
     		return value;
+    	}
     //	/*
     //	 * (non-Javadoc)
     //	 *

+    	 *
     	 * @param corpus the corpus
     	 */
     	public static void deleteCorpus(MainCorpus corpus) {
     	public void deleteCorpus(MainCorpus corpus) {
     		if (corpora != null)
     			corpora.remove(corpus);
     			corpora.remove(corpus.getID());
     		if (CQPSearchEngine.isInitialized()) {
     			try {
     				CQPSearchEngine.getCqiClient().dropCorpus(corpus.getID());
-...
+    			}
+    		}
+    	}
     	public boolean hasCorpus(MainCorpus mainCorpus) {
     		if (corpora != null) {
     			return corpora.containsKey(mainCorpus.getID());
+    		}
     		return false;
+    	}
     	public void add(MainCorpus mainCorpus) {
     		if (corpora != null) {
     			corpora.put(mainCorpus.getID(), mainCorpus);
+    		}
+    	}
+    }

     		Log.fine(NLS.bind(SearchEngineCoreMessages.info_creatingNewPartition, this.getParent(), this.userName));
     		long start = System.currentTimeMillis();
     		if (monitor != null) monitor.beginTask("Building parts...", pQueries.size());
     		for (int i = 0; i < pQueries.size(); i++) {
     			String queryS = pQueries.get(i);
-...
     				partName = "-"; //$NON-NLS-1$
+    			}
     			new Part(this, partName, queryS);
     			if (monitor != null) monitor.worked(1);
+    		}
     		long end = System.currentTimeMillis();
     		Log.fine(NLS.bind(SearchEngineCoreMessages.info_partitionCreatedInXMs, this.userName, (end - start)));
-...
     		for (String value : pValues) {
     			String partName = value.replace("\\",""); //$NON-NLS-1$ //$NON-NLS-2$
     			pPartNames.add(partName);
     			CQLQuery query = new QueryPart(pProperty.getStructuralUnit(), pProperty, CQLQuery.addBackSlash(value));
     			CQLQuery query = new QueryPart(pProperty.getStructuralUnit(), pProperty, CQLQuery.addBackSlash(value)); // second option is faster
     			pQueries.add(query.getQueryString());
+    		}
-...
     		// Parts already created
     		if (this.getParts().size() > 0) {
     			if (monitor != null) monitor.beginTask("Building parts...", this.getParts().size());
     			//FIXME: temporary fix, compute all the children parts
     			List<Part> parts = (List<Part>)getChildren(Part.class);
     			for (int i = 0; i < parts.size(); i++) {
     				parts.get(i).compute();
     				if (monitor != null) monitor.worked(1);
+    			}
+    		}
     		else {

Laboratoire ICAR » Plateforme TXM

Révision 2243