Revision 1657

tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java (revision 1657)
168 168
			Log.printStackTrace(e);
169 169
			return new Status(Status.ERROR, "org.txm.groovy.core", e.getMessage());
170 170
		} finally {
171
			if (!CQPSearchEngine.isInitialized()) { // the import failed
172
				monitor.setTaskName(GroovyMessages.restartingToolboxSearchengines); //$NON-NLS-1$
173
				Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
174
			}
171
//			if (!CQPSearchEngine.isInitialized()) { // the import failed
172
//				monitor.setTaskName(GroovyMessages.restartingToolboxSearchengines); //$NON-NLS-1$
173
//				Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
174
//			}
175 175
		}
176 176
		System.gc();
177 177
		return Status.OK_STATUS;
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java (revision 1657)
636 636
	@Override
637 637
	protected boolean _compute() throws Exception {
638 638

  
639
		if (!CQPSearchEngine.isInitialized()) return false;
639
		if (!CQPSearchEngine.isInitialized()) {
640
			Log.warning("** TXM can't load MainCorpus when CQP search engine is not ready.");
641
			return false;
642
		}
640 643

  
641 644
		HashMap<String, MainCorpus> corpora = CorpusManager.getCorpusManager().getCorpora();
642 645
		if (corpora.get(this.pID) != null && corpora.get(this.pID) != this) {
643
			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()));
646
			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()));
644 647
			return false;
645 648
		}
646 649
		corpora.put(this.pID, this);
......
659 662
			return false;
660 663
		}
661 664

  
662
		
663

  
664 665
		return true;
665 666
	}
666 667

  
tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java (revision 1657)
202 202

  
203 203
			if (shouldRestartToolbox) {
204 204
				//				org.txm.Toolbox.restartWorkspace(null);
205
				Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
205
//				Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
206 206

  
207 207
				Log.info(TXMUIMessages.info_txmIsReady);
208 208
				StatusLine.setMessage(TXMUIMessages.info_txmIsReady);
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java (revision 1657)
61 61
						
62 62
						this.acquireSemaphore();
63 63
//						org.txm.Toolbox.restartWorkspace(monitor);
64
						Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
64
//						Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
65 65
						this.releaseSemaphore();
66 66

  
67 67
						syncExec(new Runnable() {
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java (revision 1657)
115 115
			protected IStatus run(final IProgressMonitor monitor) {
116 116
				this.runInit(monitor);
117 117

  
118
				try {
119
					SearchEnginesManager.getCQPSearchEngine().stop();
120
				} catch (Exception e1) {
121
					// TODO Auto-generated catch block
122
					e1.printStackTrace();
123
				}
118
//				try {
119
//					SearchEnginesManager.getCQPSearchEngine().stop();
120
//				} catch (Exception e1) {
121
//					// TODO Auto-generated catch block
122
//					e1.printStackTrace();
123
//				}
124 124
				
125 125
				File corporaDirectory = new File(Toolbox.getTxmHomePath(), "corpora");
126 126
				if (!corporaDirectory.exists()) {
127 127
					Log.severe("Corpora directory not found. Aborting.");
128
					try {
129
						SearchEnginesManager.getCQPSearchEngine().start(null);
130
					} catch (Exception e) {
131
						// TODO Auto-generated catch block
132
						e.printStackTrace();
133
					}
128
//					try {
129
//						SearchEnginesManager.getCQPSearchEngine().start(null);
130
//					} catch (Exception e) {
131
//						// TODO Auto-generated catch block
132
//						e.printStackTrace();
133
//					}
134 134
					return Status.CANCEL_STATUS;
135 135
				}
136 136
				
......
156 156
					}
157 157
				}
158 158

  
159
				this.acquireSemaphore();
160
				try {
161
					SearchEnginesManager.getCQPSearchEngine().start(null);
162
				} catch (Exception e) {
163
					e.printStackTrace();
164
				}
165
				this.releaseSemaphore();
159
//				this.acquireSemaphore();
160
//				try {
161
//					SearchEnginesManager.getCQPSearchEngine().start(null);
162
//				} catch (Exception e) {
163
//					e.printStackTrace();
164
//				}
165
//				this.releaseSemaphore();
166 166

  
167 167
				for (Project newProject2 : newProjects) {
168 168
					try {
......
306 306
		
307 307
		try {
308 308
			
309
			SearchEngine engine = SearchEnginesManager.getCQPSearchEngine();
310
			if (engine.isRunning()) {
311
				engine.stop();
312
			}
309
//			SearchEngine engine = SearchEnginesManager.getCQPSearchEngine();
310
//			if (engine.isRunning()) {
311
//				engine.stop();
312
//			}
313 313
			
314 314
			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
315 315
			job.acquireSemaphore();
316
			Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
316
//			Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
317 317
			job.releaseSemaphore();
318 318

  
319 319
			monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform);
tmp/TXMReleasePlugins.site/site.xml (revision 1657)
3 3
   <description name="TXM Extensions - RELEASE" url="http://txm.textometrie.org/updates/plugins">
4 4
      This update site contains the Release plugins for TXM
5 5
   </description>
6
   <feature url="features/org.txm.backtomedia.feature_1.0.0.1608.jar" id="org.txm.backtomedia.feature" version="1.0.0.1608">
6
   <feature url="features/org.txm.backtomedia.feature_1.0.0.1655.jar" id="org.txm.backtomedia.feature" version="1.0.0.1655">
7 7
      <category name="Commands"/>
8 8
   </feature>
9
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1608.jar" id="org.txm.wordcloud.feature" version="1.0.0.1608">
9
   <feature url="features/org.txm.wordcloud.feature_1.0.0.1655.jar" id="org.txm.wordcloud.feature" version="1.0.0.1655">
10 10
      <category name="Commands"/>
11 11
   </feature>
12
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1608.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1608">
12
   <feature url="features/org.txm.treetagger.binaries.feature_1.0.0.1655.jar" id="org.txm.treetagger.binaries.feature" version="1.0.0.1655">
13 13
      <category name="Annotation"/>
14 14
   </feature>
15
   <feature url="features/org.txm.treetagger.models.feature_1.0.0.1608.jar" id="org.txm.treetagger.models.feature" version="1.0.0.1608">
15
   <feature url="features/org.txm.treetagger.models.feature_1.0.0.1655.jar" id="org.txm.treetagger.models.feature" version="1.0.0.1655">
16 16
      <category name="Annotation"/>
17 17
   </feature>
18
   <feature url="features/org.txm.textsbalance.feature_1.0.0.1608.jar" id="org.txm.textsbalance.feature" version="1.0.0.1608">
18
   <feature url="features/org.txm.textsbalance.feature_1.0.0.1655.jar" id="org.txm.textsbalance.feature" version="1.0.0.1655">
19 19
      <category name="Commands"/>
20 20
   </feature>
21
   <feature url="features/org.txm.annotation.urs.feature_1.0.0.1608.jar" id="org.txm.annotation.urs.feature" version="1.0.0.1608">
21
   <feature url="features/org.txm.annotation.urs.feature_1.0.0.1655.jar" id="org.txm.annotation.urs.feature" version="1.0.0.1655">
22 22
      <category name="Annotation"/>
23 23
   </feature>
24 24
   <category-def name="Commands" label="Commands"/>
tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/commands/ImportGlozzCorpus.java (revision 1657)
155 155

  
156 156
			Project project = Toolbox.workspace.getProject(name.toUpperCase());
157 157
			if (project != null) {
158
				CQPSearchEngine.getEngine().stop();
158
//				CQPSearchEngine.getEngine().stop();
159 159
				project.delete();
160 160
			}
161 161
			project = new Project(Toolbox.workspace, name.toUpperCase());

Also available in: Unified diff