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

     					project.saveParameters(true);
     					Log.info(GroovyMessages.restartingToolboxSearchengines);
     					Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
     					Log.info(TXMCoreMessages.common_done);
     //					Log.info(GroovyMessages.restartingToolboxSearchengines);
     //					Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
     //					Log.info(TXMCoreMessages.common_done);
     				} else {
     					Log.fine(GroovyMessages.errorImportNotCorrectlyEndedSeeConsoleMessages);

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the XML-TRS import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     		new File(binDir,"cqp").mkdirs()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the TXT+CSV import module");
     		if (!corpus.compute(false)) {
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Build the Alceste import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()
     		new File(binDir,"cqp").mkdirs()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the Hyperbase import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the CQP import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(corpusname);
     		corpus.setName(corpusname);
     		corpus.setDescription("Built with the XTZ import module");
     		if (!corpus.compute(false)) {
     			isSuccessFul = false;
     			return;
+    		}
     		if (module.getProject().getCleanAfterBuild()) {
     			new File(module.getBinaryDirectory(), "cqp").deleteDir()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the XML-TXM import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the CNR+CSV import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the XML/w import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     		corpus.setID(project.getName());
     		corpus.setName(project.getName());
     		corpus.setDescription("Built with the BFM import module");
     		if (!corpus.compute(false)) {corpus.delete();
     			return false;
+    		}
     		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
     cqpFile.delete()

     			corpus.setID(cqpName);
     			corpus.setName(cqpName);
     			corpus.setDescription("Built with the TMX import module");
     			if (!corpus.compute(false)) {
     				return false;
+    			}
     			File cqpFile = new File(binDir,"cqp/"+cqpName+".cqp");

     			return null;
+    		}
     		if (CQPSearchEngine.isInitialized()) {
     			Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
+    		}
     //		if (CQPSearchEngine.isInitialized()) {
     //			Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
     //		}
     		JobHandler jobhandler = new JobHandler(TXMUIMessages.scriptExecution
     				+ project.getImportModuleName()) { //$NON-NLS-1$
-...
     					e.printStackTrace();
     				} finally {
     					System.gc();
     					if (!CQPSearchEngine.isInitialized()) {
     						try {
     							SearchEnginesManager.getCQPSearchEngine().start(monitor);
     						} catch (Exception e) {
     							// TODO Auto-generated catch block
     							e.printStackTrace();
+    						}
+    					}
     //					if (!CQPSearchEngine.isInitialized()) {
     //						try {
     //							SearchEnginesManager.getCQPSearchEngine().start(monitor);
     //						} catch (Exception e) {
     //							// TODO Auto-generated catch block
     //							e.printStackTrace();
     //						}
     //					}
     					syncExec(new Runnable() {
     						@Override
     						public void run() {

tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1652)
303	303	corpus.deleteChildren(null); // remove all Corpus results
304	304	}
305	305	}
306
	306
307	307	boolean state = engine.build(this, monitor).isOK();
308	308	if(state == true) {
309	309	this.needToBuild = false;
	310	// This step could be done only if the compiler step if done and only if it modifying/deleting the corpus builds
	311	for (CorpusBuild corpus : getCorpusBuilds()) {
	312	if (corpus != null) {
	313	corpus.compute();
	314	}
	315	}
	316
310	317	}
311	318	return state;
312	319
...	...
923	930	// TODO Auto-generated catch block
924	931	e.printStackTrace();
925	932	}
926
927
928
929	933	}
930	934
931	935	Toolbox.notifyEngines(this, "clean");

+    	 *
     	 * @param corpus
     	 *            the corpus
     	 * @throws IOException
     	 */
     	@Override
     	public synchronized void dropCorpus(String corpus) {
     		throw new UnsupportedOperationException();
     	public synchronized void dropCorpus(String corpus) throws IOException {
     		this.streamToServer.write(CQI_CORPUS_DROP_CORPUS);
     		this.writeString(corpus);
     		return;
+    	}
     	// CQI_CQP_ERROR_NO_SUCH_CORPUS, CQI_CL_ERROR_NO_SUCH_ATTRIBUTE,
-...
     		server.stop();
+    	}
     	@Override
     	public boolean load_a_system_corpus(String regfilepath, String entry) throws IOException, UnexpectedAnswerException, CqiServerError {
     		this.streamToServer.write(CQI_CQP_LOAD_SYSTEM_CORPUS);
     		this.writeString(regfilepath);
     		this.writeString(entry);
     		return readBoolean();
+    	}
+    }

     	/** The Constant CQI_CQP_FDIST_2. */
     	final static public byte[] CQI_CQP_FDIST_2 = { (byte) 0x15, (byte) 0x11 };
     	/** The Constant CQI_CQP_QUERY. */
     	final static public byte[] CQI_CQP_QUERY_EVAL = { (byte) 0x15, (byte) 0x01 };
     	final static public byte[] CQI_CQP_QUERY_EVAL = { (byte) 0x15, (byte) 0x012 };
     	/** The Constant CQI_CQP_LOAD_SYSTEM_CORPUS. */
     	final static public byte[] CQI_CQP_LOAD_SYSTEM_CORPUS = { (byte) 0x15, (byte) 0x13 };
     	/** The Constant CQI_CONST_FIELD_MATCH. */
     	final public static byte CQI_CONST_FIELD_MATCH = (byte) 0x10;
-...
     			byte field1, String attribute1, byte field2, String attribute2) throws IOException, UnexpectedAnswerException, CqiServerError;
     	public boolean reconnect() ;
     	/**
     	 * Runs a CQP query line (ends with ";").
+    	 *
     	 * @param query the query
     	 * @throws CqiServerError
     	 * @throws UnexpectedAnswerException
     	 * @throws IOException
     	 */
     	public void query(String query) throws IOException, UnexpectedAnswerException, CqiServerError;
     	/**
     	 * Load a system corpus
+    	 *
     	 * @param regfilepath the subcorpus
     	 * @param entry the corpus ID (uppercase)
     	 * @return
     	 * @throws CqiServerError
     	 * @throws UnexpectedAnswerException
     	 * @throws IOException
     	 */
     	public boolean load_a_system_corpus(String regfilepath, String entry) throws IOException, UnexpectedAnswerException, CqiServerError;
+    }

     			return getName();
+    		}
+    	}
     	protected boolean modified = false;
     	public boolean isModified() { return modified; }
     	public void setIsModified(boolean b) { modified = b; }
-...
     	@Override
     	protected boolean _compute() throws Exception {
     		if (!CQPSearchEngine.isInitialized()) return false;
     		HashMap<String, MainCorpus> corpora = CorpusManager.getCorpusManager().getCorpora();
     		if (corpora.get(this.pID) != null && corpora.get(this.pID) != this) {
     			Log.severe(NLS.bind("** Error: 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()));
-...
+    		}
     		corpora.put(this.pID, this);
     		if (CQPSearchEngine.isInitialized()) {
     			try {
     				CQPSearchEngine.getCqiClient().corpusCharset(this.pID);
     				corpora.put(this.pID, this); // register the corpus
     			} catch(Exception e) {
     				if (corpora.get(this.pID) == this) {
     					corpora.remove(this.pID); // unregister the broken corpus
+    				}
     				return false;
     		this.dataDirectory = new File(getProjectDirectory(), "data/"+getID());
     		this.registryFile = new File(getProjectDirectory(), "registry/"+getID().toLowerCase());
     		try {
     			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);
     			if (corpora.get(this.pID) == this) {
     				corpora.remove(this.pID); // unregister the broken corpus
+    			}
     			return false;
+    		}
     		this.dataDirectory = new File(getProjectDirectory(), "data/"+getID());
     		this.registryFile = new File(getProjectDirectory(), "registry/"+getID().toLowerCase());
     		return true;
+    	}

     	public abstract int[] alg2Cpos(String attribute, int struc) throws UnexpectedAnswerException, IOException, CqiServerError;
     	/**
     	 * Runs a CQP query.
     	 * Runs a CQL query.
+    	 *
     	 * @param motherCorpus the mother corpus
     	 * @param subcorpus the subcorpus
-...
     	public abstract void cqpQuery(String motherCorpus, String subcorpus, String query) throws IOException, UnexpectedAnswerException, CqiServerError;
     	/**
     	 * Runs a CQP query line.
+    	 *
     	 * @param motherCorpus the mother corpus
     	 * @param subcorpus the subcorpus
     	 * @param query the query
     	 * @throws IOException Signals that an I/O exception has occurred.
     	 * @throws UnexpectedAnswerException Signals that the data read on the socket is unexpected
     	 * @throws CqiServerError the cqi server error
     	 */
     	@Override
     	public abstract void query(String query) throws IOException, UnexpectedAnswerException, CqiServerError;
     	/**
     	 * Runs a CQP query.
+    	 *
     	 * @param motherCorpus the mother corpus
     	 * @param subcorpus the subcorpus
     	 * @param query the query
     	 * @return
     	 * @throws IOException Signals that an I/O exception has occurred.
     	 * @throws UnexpectedAnswerException Signals that the data read on the socket is unexpected
     	 * @throws CqiServerError the cqi server error
     	 */
     	@Override
     	public abstract boolean load_a_system_corpus(String regfilepath, String entry) throws IOException, UnexpectedAnswerException, CqiServerError;
     	/**
     	 * Lists all the subcorpora of a corpus.
+    	 *
     	 * @param corpus the corpus

     import org.txm.utils.ExecTimer;
     import org.txm.utils.logger.Log;
     // TODO: Auto-generated Javadoc
     /**
      * Memory implementation of CQP Server usqing the cqi JNI library
+     *
-...
     			LIBRARIES.setAccessible(true);
     			// FIXME: Debug
     			System.err.println(">>>>>>>>>>>>>>>>>>>> MemCqiServer.start() " + this.getClass().getClassLoader());
     			//System.err.println(">>>>>>>>>>>>>>>>>>>> MemCqiServer.start() " + this.getClass().getClassLoader());
     			try {
-...
     	static Boolean isLoaded = false;
     	public native Boolean start(String[] args);
     	public native Boolean load_a_system_corpus(String regfilepath, String entryname) throws IOException, UnexpectedAnswerException, CqiServerError ;
     	public native Boolean stop();
     	public native int[] alg2Cpos(String arg0, int arg1) throws UnexpectedAnswerException, IOException, CqiServerError;

     				(byte)value};
+    	}
     	public byte[] throwExceptionFromCqi(int error) throws CqiServerError, UnexpectedAnswerException, IOException {
     		return throwExceptionFromCqi("CQi", error);
+    	}
     	public byte[] throwExceptionFromCqi(int error) throws CqiServerError, UnexpectedAnswerException, IOException {
     	public byte[] throwExceptionFromCqi(String message, int error) throws CqiServerError, UnexpectedAnswerException, IOException {
     		byte[] ret = intToByteArray(error);
     		byte b = ret[2];
-...
     			switch (b2) {
     			case 0x01:// cf cqi.h:39
     				lastError += ": NoSuchAttribute error";
     				throw new CqiClErrorNoSuchAttribute();
     				throw new CqiClErrorNoSuchAttribute(message);
     			case 0x02:// cf cqi.h:40
     				lastError += ": WrongAttributeType error";
     				throw new CqiClErrorWrongAttributeType();
     				throw new CqiClErrorWrongAttributeType(message);
     			case 0x03:// cf cqi.h:41
     				lastError += ": OutOfRange error";
     				throw new CqiClErrorOutOfRange();
     				throw new CqiClErrorOutOfRange(message);
     			case 0x04:// cf cqi.h:42
     				lastError = this.getLastCqiError();
     				throw new CqiClErrorRegex();
     				throw new CqiClErrorRegex(message);
     			case 0x05:// cf cqi.h:42
     				lastError += ": CorpusAccess error";
     				throw new CqiClErrorCorpusAccess();
     				throw new CqiClErrorCorpusAccess(message);
     			case 0x06:// cf cqi.h:42
     				lastError += ": OutOfMemory error";
     				throw new CqiClErrorOutOfMemory();
     				throw new CqiClErrorOutOfMemory(message);
     			case 0x07:// cf cqi.h:42
     				lastError += ": Internal error";
     				throw new CqiClErrorInternal();
     				throw new CqiClErrorInternal(message);
     			default:
     				lastError += ": Unknown error";
     				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorColonB1+b+CQPSearchEngineCoreMessages.b2+b2);
-...
     			switch (b2) {
     			case 0x01:// cf cqi.h:39
     				lastError += ": General error";
     				throw new CqiCqpErrorErrorGeneral();
     				throw new CqiCqpErrorErrorGeneral(message);
     			case 0x02:// cf cqi.h:40
     				lastError += ": NoSuchCorpus error";
     				throw new CqiCqpErrorNoSuchCorpus();
     				throw new CqiCqpErrorNoSuchCorpus(message);
     			case 0x03:// cf cqi.h:41
     				lastError += ": InvalidField error";
     				throw new CqiCqpErrorInvalidField();
     				throw new CqiCqpErrorInvalidField(message);
     			case 0x04:// cf cqi.h:42
     				lastError += ": OutOfRange error";
     				throw new CqiCqpErrorOutOfRange();
     				throw new CqiCqpErrorOutOfRange(message);
     			case 0x05:// cf cqi.h:44
     				lastError = getLastCQPError();
     				throw new CqiCqpErrorSyntax();
     				throw new CqiCqpErrorSyntax(message);
     			default:
     				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorColonB1+b+CQPSearchEngineCoreMessages.b2+b2);
+    			}
-...
     		Boolean ret = server.dropSubCorpus(arg0);
     		if (ret == null || !ret) {
     			throwExceptionFromCqi(server.getErrorCode());
     			throwExceptionFromCqi("Fail to drop subcorpus "+arg0+": ", server.getErrorCode());
+    		}
+    	}
-...
+    		}
     		return rez;
+    	}
     	@Override
     	public boolean load_a_system_corpus(String regfilepath, String entry) throws IOException, UnexpectedAnswerException, CqiServerError {
     		return server.load_a_system_corpus(regfilepath, entry);
+    	}
+    }

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/ICqiServer.java (revision 1652)
30	30	import java.io.InputStream;
31	31	import java.io.OutputStream;
32	32
33		// TODO: Auto-generated Javadoc
34	33	/**
35	34	* This class aims at handling a CQi server process. It is not a CQi server per
36	35	* se.

Laboratoire ICAR » Plateforme TXM

Révision 1652