Révision 1358

tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java (revision 1358)
27 27

  
28 28
public class CQPSearchEngine extends SearchEngine {
29 29

  
30
	
31
	public static final String NAME = "CQP";
32
	
30 33
	/**
31 34
	 * initialization state
32 35
	 */
......
35 38

  
36 39
	@Override
37 40
	public String getName() {
38
		return "CQP";
41
		return CQPSearchEngine.NAME;
39 42
	}
40 43

  
41 44
	/**
......
54 57

  
55 58
		useNetCQi = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_NETWORK_MODE);
56 59

  
57
		Log.warning("Killing CQP and RServe process if any");
60
		Log.warning("Killing CQP processes if any.");
58 61
		killSearchEngine();
59 62

  
60 63
		boolean remote = CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.CQI_SERVER_IS_REMOTE);
......
65 68
		String path_separator = System.getProperty("path.separator");
66 69
		File wl = Toolbox.workspace.getLocation();
67 70
		if (wl == null) {
68
			System.out.println("Error: Toolbox not correctly initialized. Aborting CQP engine initializing.");
71
			System.out.println("Error: Toolbox is not correctly initialized. Aborting CQP engine start...");
69 72
			return false;
70 73
		}
71 74
		for (File binDir : wl.listFiles()) {
......
89 92
					try {
90 93
						PatchCwbRegistry.patch(registryFile, dataDirectory);
91 94
					} catch (IOException e) {
92
						System.out.println("Error while updating registry file "+registryFile+": "+e);
95
						System.out.println(TXMCoreMessages.bind("Error while updating registry file {0}.", registryFile));
93 96
						Log.printStackTrace(e);
94 97
						return false;
95 98
					}
......
101 104

  
102 105
		String init_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE);
103 106
		if (init_path.length() > 0 && !new File(init_path).exists()) {
104
			System.out.println("Warning: the given CQP init file path cannot be found: "+init_path);
107
			System.out.println(TXMCoreMessages.bind("Warning: the given CQP init file path can not be found in {0}.", init_path));
105 108
			init_path = null;
106 109
		}
107 110

  
......
122 125

  
123 126
				String exec_path = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE);
124 127

  
125
				if (exec_path == null || exec_path.length() == 0) {
126
					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
128
				if (exec_path == null || exec_path.length() == 0 || new File(exec_path).exists()) {
129
					System.out.println(TXMCoreMessages.bind("Error: the '{0}' preference is not set.", CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE));
127 130
				}
128
				if (new File(exec_path).exists()) {
129
					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
130
				}
131
//				if (new File(exec_path).exists()) {
132
//					System.out.println("Error: the '"+CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE+"' preference is not set.");
133
//				}
131 134

  
132 135
				cqiServer = new NetCqiServer(exec_path,
133 136
						reg_path, 
......
149 152
					try {
150 153
						cqiClient = new MemCqiClient((MemCqiServer) cqiServer);
151 154
					} catch(Exception e) {
152
						Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot+e);
155
						Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot);
156
						Log.printStackTrace(e);
153 157
						cqiserverok = false;
154 158
					}
155 159
				} else {
......
159 163
				}
160 164
			}
161 165
		} catch (NumberFormatException e1) {
162
			Log.severe(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
166
			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT))); 
163 167
		} catch (ServerNotFoundException e1) {
164
			Log.severe(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
165
					+ TXMCoreMessages.and + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
168
			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST),
169
					CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT))); 
166 170
		}
167 171

  
168 172
		// try connecting to the CWB server
......
179 183
		if (state == false) {
180 184
			System.out.println(TXMCoreMessages.errorWhileConnectingToSearchEngine); 
181 185
			if (cqiClient instanceof NetCqiClient) {
182
				System.out.println(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot + 
183
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN) + " " + //$NON-NLS-1$
184
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD) + 
185
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST) + " " + //$NON-NLS-1$
186
						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT));
186
				System.out.println(TXMCoreMessages.bind(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot, CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN),
187
						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD), CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST),
188
						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT)));
187 189
			}
188 190
			if (cqiServer != null && cqiServer instanceof NetCqiServer) {
189
				System.out.println(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot + cqiServer.getLastCmdLine());
191
				System.out.println(TXMCoreMessages.bind(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot, cqiServer.getLastCmdLine()));
190 192
			}
191 193
		} else {
192 194
			if (cqiServer == null || cqiServer instanceof NetCqiServer)
193
				System.out.println(TXMCoreMessages.connected); 
195
				System.out.println(TXMCoreMessages.connectedToCQP); 
194 196
		}
195 197

  
196 198
		CorpusManager.setCqiClient(cqiClient);
......
211 213
			} while (CorpusManager.getCorpusManager().getCorpora().size() == 0);
212 214
		} catch (Exception e) {
213 215
			org.txm.utils.logger.Log.printStackTrace(e);
214
			Log.severe(TXMCoreMessages.errorWhileWaitingForCQP + e);
216
			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.errorWhileWaitingForCQP, e));
215 217
		} 
216 218

  
219
		// FIXME: SJ: this test should be moved at start of this method? before running CQP? 
217 220
		if (Toolbox.workspace == null) {
218
			System.out.println("Can't start CQP with workspace not ready.");
221
			Log.severe("Can't start CQP with workspace not ready.");
219 222
			return false;
220 223
		}
221 224

  
......
230 233
//			}
231 234
//		}
232 235
		
233
		System.out.println(TXMCoreMessages.common_done);
236
		Log.info(TXMCoreMessages.common_done);
234 237

  
235 238
		return state;
236 239
	}
......
351 354
					p = Runtime.getRuntime().exec("taskkill /IM cqpserver.exe /F"); //$NON-NLS-1$
352 355
					p.waitFor();
353 356
				} catch (IOException e) {
354
					Log.severe(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
355
					System.out.println(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
357
					Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot, Log.toString(e)));
358
					System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot, Log.toString(e)));
356 359
					try {
357 360
						Process p = Runtime.getRuntime().exec(
358 361
								"tskill cqpserver.exe"); //$NON-NLS-1$
......
360 363
						p = Runtime.getRuntime().exec("tskill cqpserver.exe"); //$NON-NLS-1$
361 364
						p.waitFor();
362 365
					} catch (IOException e2) {
363
						Log.severe(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
364
						System.out.println(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
366
						e2.printStackTrace();
367
						Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTskillCqpserverexeDDot, Log.toString(e2)));
368
						System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExecTskillCqpserverexeDDot, Log.toString(e2)));
365 369
					} catch (InterruptedException e3) {
370
						e3.printStackTrace();
366 371
						Log.severe(Log.toString(e3));
367 372
						System.out.println(Log.toString(e3));
368 373
					}
369 374
				} catch (InterruptedException e) {
370
					Log.severe("Error while closing CQP: "+e.getLocalizedMessage());
375
					Log.severe(TXMCoreMessages.bind("Error while closing CQP: {0}.", e.getLocalizedMessage()));
376
					e.printStackTrace();
371 377
					System.out.println(Log.toString(e));
372 378
				}
373 379
				;
......
393 399
					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
394 400

  
395 401
				} catch (Exception e) {
396
					Log.severe(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
397
					System.out.println(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
402
					Log.severe(TXMCoreMessages.bind(TXMCoreMessages.failedToExec, cmd, Log.toString(e)));
403
					System.out.println(TXMCoreMessages.bind(TXMCoreMessages.failedToExec, cmd, Log.toString(e)));
398 404
					org.txm.utils.logger.Log.printStackTrace(e);
399 405
				}
400 406
			}
......
412 418
			ret = ret && start(null);
413 419
			return ret;
414 420
		} catch (Exception e) {
415
			Log.severe("Error while restarting CQP: "+e.getLocalizedMessage());
421
			Log.severe(TXMCoreMessages.bind("Error while restarting CQP: {0}.", e.getLocalizedMessage()));
416 422
		}
417 423
		return false;
418 424
	}
......
423 429
	 * @return true, if is initialized
424 430
	 */
425 431
	public static boolean isInitialized() {
426
		return Toolbox.getEngineManager(EngineType.SEARCH).getEngine("CQP").isRunning();
432
		return Toolbox.getEngineManager(EngineType.SEARCH).getEngine(CQPSearchEngine.NAME).isRunning();
427 433
	}
428 434

  
429 435
	@Override
......
442 448

  
443 449
	@Override
444 450
	public Query newQuery() {
445
		return new CQLQuery("");
451
		return new CQLQuery(""); //$NON-NLS-1$
446 452
	}
447 453

  
448 454
	@Override
......
465 471
	}
466 472

  
467 473
	public static CQPSearchEngine getEngine() {
468
		return (CQPSearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine("CQP");
474
		return (CQPSearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine(CQPSearchEngine.NAME);
469 475
	}
470 476
}
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 1358)
22 22
common_description               = Description
23 23
common_done                      = Done.
24 24
common_fMax                      = Fmax
25
common_fMin                      = Fmin

25
common_fMin                      = Fmin
26 26
common_fMinEquals                = Fmin={0}
27 27
common_frequency                 = Frequency
28 28
common_lowestFrequency           = Lowest frequency
......
43 43

  
44 44
computingDDot = Computing: 
45 45

  
46
connected = connected
46
connectedToCQP = Connected to CQP.
47 47

  
48 48
corpusDDot = Corpus: 
49 49

  
......
71 71

  
72 72
encodingDDot = , Encoding: 
73 73

  
74
endOfCQPWaitTest = End of CQP wait test
74
endOfCQPWaitTest = End of CQP waiting test.
75 75

  
76 76
errorConfigdirDirDDot = Error configdir dir: 
77 77

  
......
85 85

  
86 86
errorDDotSkippingTheLoadingOfCorpusDDot = Error: skipping the loading of corpus: 
87 87

  
88
errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** Error : the connexion to the server failed: wrong port format
88
errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** Error : the connexion to the server failed: wrong port format: {0}.
89 89

  
90 90
errorDDotThisExceptionShouldNotBeThrown = ** Error: This exception should not be thrown
91 91

  
92
errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Error : while connection to search engine, with the following parameters: 
92
errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Error while connecting to search engine with the following parameters: {0} and {1}.
93 93

  
94 94
errorDuringWorkspaceInitializationDDot = ** Error during workspace initialization:
95 95

  
......
97 97

  
98 98
errorRegDirDDot = Error reg dir: 
99 99

  
100
errorWhileConnectingToSearchEngine = ** Error while connecting to search engine.
100
errorWhileConnectingToSearchEngine = ** Error while connecting CQP server.
101 101

  
102 102
errorWhileGettingMetadatasFromBaseimportMetadatasDDot = Error while getting metadatas from Base.importMetadatas: 
103 103

  
104
errorWhileWaitingForCQP = ** Error while waiting for CQP
104
errorWhileWaitingForCQP = ** Error while waiting for CQP: {0}.
105 105

  
106 106
error_error                                                                          = ** Error: {0}.
107 107
error_error2                                                                         = Error
......
117 117

  
118 118
failedToCreatePartDDot = ** Failed to create part: 
119 119

  
120
failedToExec = Failed to exec '
120
failedToExec = Failed to exec '{0}: {1}.
121 121

  
122
failedToExecTaskkillIMCqpserverexeFDDot = Failed to exec 'taskkill /IM cqpserver.exe /F': 
122
failedToExecTaskkillIMCqpserverexeFDDot = Failed to exec 'taskkill /IM cqpserver.exe /F': {0}.
123 123

  
124
failedToExecTskillCqpserverexeDDot = Failed to exec 'tskill cqpserver.exe': 
124
failedToExecTskillCqpserverexeDDot = Failed to exec 'tskill cqpserver.exe': {0}.
125 125

  
126 126
failedToGetLastCQPErrorDDot = Failed to get last CQP error: 
127 127

  
......
133 133

  
134 134
failedToRestoreSubcorpus = ** Failed to restore subcorpus 
135 135

  
136
failedToStartMemCqiClientDDot = Failed to start MemCqiClient: 
136
failedToStartMemCqiClientDDot = Failed to start CQP in memory mode.
137 137

  
138 138
file = ** File
139 139

  
......
191 191

  
192 192
numberOfSubMatch = Number of sub match 
193 193

  
194
orTheEngineWasNotStartedWithTheCommandLineDDot = - or the engine was not started with the command line: 
194
orTheEngineWasNotStartedWithTheCommandLineDDot = CQI server failed to started with the command line: {0}.
195 195

  
196 196
pARAMSDDot = PARAMS: 
197 197

  
......
249 249

  
250 250
workspaceDDot = \ Workspace: 
251 251

  
252
wrongLoginOrPasswordOrPortDDot = - wrong login or password or port : 
252
wrongLoginOrPasswordOrPortDDot = Wrong login, password, host or port in : {0} {1} {2} {3}.
253 253

  
254 254
xmlValidationDDot = XmlValidation: 
tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java (revision 1358)
156 156
	public static String print2; 
157 157
	public static String failedToExec; 
158 158
	public static String dDot; 
159
	public static String connected; 
159
	public static String connectedToCQP; 
160 160
	public static String errorDuringWorkspaceInitializationDDot; 
161 161
	public static String errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat; 
162 162
	public static String queryWasDDot; 
tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties (revision 1358)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
1
#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)

2 2
#TXM messages generated by the PluginMessagesManager class
3 3
#Mon Nov 12 17:18:22 CET 2018
4 4

  
......
41 41

  
42 42
computingDDot = Calcul: 
43 43

  
44
connected = connecté.
44
connectedToCQP = Connecté à CQP.
45 45

  
46 46
corpusDDot = Corpus : 
47 47

  
......
69 69

  
70 70
encodingDDot = , Encodage : 
71 71

  
72
endOfCQPWaitTest = Fin du test d'attente de CQP
72
endOfCQPWaitTest = Fin du test d'attente de CQP.
73 73

  
74 74
errorConfigdirDirDDot = Erreur dans le dossier de configuration : 
75 75

  
......
83 83

  
84 84
errorDDotSkippingTheLoadingOfCorpusDDot = Erreur : le corpus ne sera pas chargé
85 85

  
86
errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier
86
errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier: {0}.
87 87

  
88 88
errorDDotThisExceptionShouldNotBeThrown = ** Erreur : Cette exception ne devrait pas se lever
89 89

  
90
errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
90
errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot = ** Echec de connexion au moteur de recherche avec les paramètres suivants : {0} et {1}.
91 91

  
92 92
errorDuringWorkspaceInitializationDDot = ** Echec de l'initialisation de l'espace de travail : 
93 93

  
......
99 99

  
100 100
errorWhileGettingMetadatasFromBaseimportMetadatasDDot = Erreur lors de la récupération des metadonnées du corpus
101 101

  
102
errorWhileWaitingForCQP = ** Échec du test d'attente de CQP : 
102
errorWhileWaitingForCQP = ** Échec du test d'attente de CQP : {0}.
103 103

  
104 104
error_error                                                                          = ** Erreur : {0}.
105 105
error_error2                                                                         = Erreur
......
111 111

  
112 112
failedToCreatePartDDot = ** Echec de la création de la partie :
113 113

  
114
failedToExec = Echec de l'exécution de '
114
failedToExec = Echec de l'exécution de '{0} : {1}.
115 115

  
116
failedToExecTaskkillIMCqpserverexeFDDot = Echec de la commande 'taskkill /IM cqpserver.exe /F': 
116
failedToExecTaskkillIMCqpserverexeFDDot = Echec de la commande 'taskkill /IM cqpserver.exe /F': {0}.
117 117

  
118
failedToExecTskillCqpserverexeDDot = Echec de la commande 'tskill cqpserver.exe': 
118
failedToExecTskillCqpserverexeDDot = Echec de la commande 'tskill cqpserver.exe': {0}.
119 119

  
120 120
failedToGetLastCQPErrorDDot = Erreur lors de la récupération de la dernière erreur CQP : 
121 121

  
......
127 127

  
128 128
failedToRestoreSubcorpus = ** Echec de la restauration du sous-corpus
129 129

  
130
failedToStartMemCqiClientDDot = Erreur lors du démarage du mode mémoire de CQP
130
failedToStartMemCqiClientDDot = Erreur lors du démarage du mode mémoire de CQP.
131 131

  
132 132
file = ** Le fichier 
133 133

  
......
179 179

  
180 180
numberOfSubMatch = Nombre de sous graph
181 181

  
182
orTheEngineWasNotStartedWithTheCommandLineDDot = - ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
182
orTheEngineWasNotStartedWithTheCommandLineDDot = Le démarrage du serveur CQI a échoué avec la ligne de commande : {0}.
183 183

  
184 184
pARAMSDDot = Paramètres : 
185 185

  
......
235 235

  
236 236
workspaceDDot = \ Espace de travail : 
237 237

  
238
wrongLoginOrPasswordOrPortDDot = - mauvais login/mot de passe/nom de machine/port :
238
wrongLoginOrPasswordOrPortDDot = Mauvais login, mot de passe, nom de machine ou port dans : {0} {1} {2} {3}.
239 239

  
240 240
xmlValidationDDot = Validation XML : 

Formats disponibles : Unified diff