Révision 509
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java (revision 509) | ||
---|---|---|
150 | 150 |
|
151 | 151 |
try { |
152 | 152 |
String path = System.getProperty("java.library.path"); |
153 |
String libpath = System.getProperty("path.separator")+Toolbox.getParam(TBXPreferences.CQI_SERVER_PATH_TO_CQPLIB);
|
|
153 |
String libpath = System.getProperty("path.separator")+Toolbox.getParam(CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB);
|
|
154 | 154 |
if (!path.contains(libpath)) { |
155 | 155 |
path += libpath; |
156 | 156 |
} |
... | ... | |
452 | 452 |
String[] strings = {"je", "jamais"}; |
453 | 453 |
int[] strucpos = {0, 1, 2, 3 , 4}; |
454 | 454 |
|
455 |
Toolbox.setParam(TBXPreferences.CQI_SERVER_PATH_TO_CQPLIB, pathToExecutable);
|
|
455 |
Toolbox.setParam(CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB, pathToExecutable);
|
|
456 | 456 |
|
457 | 457 |
MemCqiServer server = new MemCqiServer(pathToExecutable, pathToRegistry, pathToInitFile, " -b 10000000 -d OFF", false); |
458 | 458 |
if (server.start()) System.out.println("Mem Server ok"); |
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java (revision 509) | ||
---|---|---|
1 |
package org.txm.searchengine.cqp; |
|
2 |
|
|
3 |
import org.eclipse.core.runtime.preferences.DefaultScope; |
|
4 |
import org.osgi.framework.FrameworkUtil; |
|
5 |
import org.osgi.service.prefs.Preferences; |
|
6 |
import org.txm.core.messages.TXMCoreMessages; |
|
7 |
import org.txm.core.preferences.TBXPreferences; |
|
8 |
import org.txm.core.preferences.TXMPreferences; |
|
9 |
import org.txm.utils.logger.Log; |
|
10 |
|
|
11 |
public class CQPPreferences extends TXMPreferences { |
|
12 |
|
|
13 |
public static String PREFERENCES_NODE = FrameworkUtil.getBundle(CQPPreferences.class).getSymbolicName(); |
|
14 |
|
|
15 |
/** The Constant CQI_SERVER_HOST. */ |
|
16 |
public static final String CQI_SERVER_HOST = "cqi_server_host"; //$NON-NLS-1$ |
|
17 |
|
|
18 |
/** The Constant CQI_SERVER_PORT. */ |
|
19 |
public static final String CQI_SERVER_PORT = "cqi_server_port"; //$NON-NLS-1$ |
|
20 |
|
|
21 |
/** The Constant CQI_SERVER_LOGIN. */ |
|
22 |
public static final String CQI_SERVER_LOGIN = "cqi_server_login"; //$NON-NLS-1$ |
|
23 |
|
|
24 |
/** The Constant CQI_SERVER_PASSWORD. */ |
|
25 |
public static final String CQI_SERVER_PASSWORD = "cqi_server_password"; //$NON-NLS-1$ |
|
26 |
|
|
27 |
/** The Constant CQI_SERVER_PATH_TO_EXECUTABLE. */ |
|
28 |
public static final String CQI_SERVER_PATH_TO_EXECUTABLE = "cqi_server_path_to_executable"; //$NON-NLS-1$ |
|
29 |
|
|
30 |
public static final String CQI_SERVER_PATH_TO_CQPLIB = "cqi_server_path_to_cqplib"; //$NON-NLS-1$ |
|
31 |
|
|
32 |
/** The Constant CQI_SERVER_PATH_TO_INIT_FILE. */ |
|
33 |
public static final String CQI_SERVER_PATH_TO_INIT_FILE = "cqi_server_path_to_init_file"; //$NON-NLS-1$ |
|
34 |
|
|
35 |
/** The Constant CQI_SERVER_ADDITIONAL_OPTIONS. */ |
|
36 |
public static final String CQI_SERVER_ADDITIONAL_OPTIONS = "cqi_server_additional_options"; //$NON-NLS-1$ |
|
37 |
|
|
38 |
/** The Constant CQI_SERVER_MONITOR_OUTPUT. */ |
|
39 |
public static final String CQI_SERVER_MONITOR_OUTPUT = "cqi_server_monitor_output"; //$NON-NLS-1$ |
|
40 |
|
|
41 |
/** The Constant CQI_SERVER_IS_REMOTE. */ |
|
42 |
public static final String CQI_SERVER_IS_REMOTE = "cqi_server_is_remote"; //$NON-NLS-1$ |
|
43 |
|
|
44 |
/** The Constant CQI_SERVER_MODE. */ |
|
45 |
public static final String CQI_NETWORK_MODE = "cqi_server_mode"; //$NON-NLS-1$ |
|
46 |
|
|
47 |
public static final String CQP_EMPTY_VALUE_CODE = "cqp_empty_value_code"; |
|
48 |
|
|
49 |
@Override |
|
50 |
public void initializeDefaultPreferences() { |
|
51 |
Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); |
|
52 |
|
|
53 |
Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE); |
|
54 |
|
|
55 |
preferences.put(CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$ |
|
56 |
preferences.put(CQI_SERVER_PORT, "4877"); //$NON-NLS-1$ |
|
57 |
preferences.put(CQI_SERVER_HOST, "localhost"); //$NON-NLS-1$ |
|
58 |
preferences.put(CQI_SERVER_LOGIN, "anonymous"); //$NON-NLS-1$ |
|
59 |
preferences.put(CQI_SERVER_PASSWORD, ""); //$NON-NLS-1$ |
|
60 |
preferences.put(CQI_SERVER_IS_REMOTE, "" + false); //$NON-NLS-1$ |
|
61 |
preferences.putBoolean(CQI_NETWORK_MODE, false); //$NON-NLS-1$ |
|
62 |
preferences.put(CQP_EMPTY_VALUE_CODE, ""); //$NON-NLS-1$ |
|
63 |
} |
|
64 |
} |
|
0 | 65 |
tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java (revision 509) | ||
---|---|---|
45 | 45 |
|
46 | 46 |
boolean cqiserverok = false; |
47 | 47 |
|
48 |
useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_NETWORK_MODE, TBXPreferences.PREFERENCES_NODE));
|
|
48 |
useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(CQPPreferences.CQI_NETWORK_MODE, CQPPreferences.PREFERENCES_NODE));
|
|
49 | 49 |
|
50 | 50 |
Log.warning("Killing CQP and RServe process if any"); |
51 | 51 |
killSearchEngine(); |
52 | 52 |
|
53 | 53 |
|
54 |
boolean remote = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE));
|
|
54 |
boolean remote = Boolean.parseBoolean(TXMPreferences.getString(CQPPreferences.CQI_SERVER_IS_REMOTE, CQPPreferences.PREFERENCES_NODE));
|
|
55 | 55 |
state = false; |
56 | 56 |
// test if must-have properties for CWB are set |
57 | 57 |
|
58 |
String exec_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, TBXPreferences.PREFERENCES_NODE);
|
|
58 |
String exec_path = TXMPreferences.getString(CQPPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, CQPPreferences.PREFERENCES_NODE);
|
|
59 | 59 |
String reg_path = ""; // new way that concats registry of loaded corpus |
60 | 60 |
String path_separator = System.getProperty("path.separator"); |
61 | 61 |
for (Base b : Toolbox.workspace.getProject("default").getBases()) { |
... | ... | |
82 | 82 |
if (reg_path.length() > 0) reg_path = reg_path.substring(path_separator.length()); // remove first path_separator |
83 | 83 |
reg_path = reg_path.replace("\\\\", "//"); // fix the UNC paths for mingw |
84 | 84 |
|
85 |
String init_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE, TBXPreferences.PREFERENCES_NODE);
|
|
85 |
String init_path = TXMPreferences.getString(CQPPreferences.CQI_SERVER_PATH_TO_INIT_FILE, CQPPreferences.PREFERENCES_NODE);
|
|
86 | 86 |
|
87 | 87 |
|
88 | 88 |
if (!remote) { |
... | ... | |
96 | 96 |
cqiServer = new MemCqiServer(exec_path, |
97 | 97 |
reg_path, |
98 | 98 |
init_path, |
99 |
TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
|
|
100 |
+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
|
|
101 |
Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
|
|
99 |
TXMPreferences.getString(CQPPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPPreferences.PREFERENCES_NODE)
|
|
100 |
+ " -P " + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE), //$NON-NLS-1$
|
|
101 |
Boolean.parseBoolean(TXMPreferences.getString(CQPPreferences.CQI_SERVER_MONITOR_OUTPUT, CQPPreferences.PREFERENCES_NODE)));
|
|
102 | 102 |
} catch (Exception e) { |
103 | 103 |
// TODO Auto-generated catch block |
104 | 104 |
org.txm.utils.logger.Log.printStackTrace(e); |
... | ... | |
107 | 107 |
cqiServer = new NetCqiServer(exec_path, |
108 | 108 |
reg_path, |
109 | 109 |
init_path, |
110 |
TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
|
|
111 |
+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
|
|
112 |
Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
|
|
110 |
TXMPreferences.getString(CQPPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPPreferences.PREFERENCES_NODE)
|
|
111 |
+ " -P " + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE), //$NON-NLS-1$
|
|
112 |
Boolean.parseBoolean(TXMPreferences.getString(CQPPreferences.CQI_SERVER_MONITOR_OUTPUT, CQPPreferences.PREFERENCES_NODE)));
|
|
113 | 113 |
} |
114 | 114 |
if (cqiServer != null) |
115 | 115 |
cqiserverok = cqiServer.start(); |
... | ... | |
127 | 127 |
cqiserverok = false; |
128 | 128 |
} |
129 | 129 |
} else { |
130 |
int port = Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE));
|
|
131 |
String host = TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE);
|
|
130 |
int port = Integer.parseInt(TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE));
|
|
131 |
String host = TXMPreferences.getString(CQPPreferences.CQI_SERVER_HOST, CQPPreferences.PREFERENCES_NODE);
|
|
132 | 132 |
cqiClient = new NetCqiClient(host, port); |
133 | 133 |
} |
134 | 134 |
} |
135 | 135 |
} catch (NumberFormatException e1) { |
136 |
Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE));
|
|
136 |
Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE));
|
|
137 | 137 |
} catch (ServerNotFoundException e1) { |
138 |
Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE)
|
|
139 |
+ TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE));
|
|
138 |
Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(CQPPreferences.CQI_SERVER_HOST, CQPPreferences.PREFERENCES_NODE)
|
|
139 |
+ TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE));
|
|
140 | 140 |
} |
141 | 141 |
|
142 | 142 |
// try connecting to the CWB server |
143 | 143 |
try { |
144 | 144 |
if (cqiserverok) { |
145 |
String login = TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE);
|
|
146 |
String password = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE);
|
|
145 |
String login = TXMPreferences.getString(CQPPreferences.CQI_SERVER_LOGIN, CQPPreferences.PREFERENCES_NODE);
|
|
146 |
String password = TXMPreferences.getString(CQPPreferences.CQI_SERVER_PASSWORD, CQPPreferences.PREFERENCES_NODE);
|
|
147 | 147 |
state = cqiClient.connect(login, password); |
148 | 148 |
} |
149 | 149 |
} catch (Exception e1) { |
... | ... | |
152 | 152 |
|
153 | 153 |
if (state == false) { |
154 | 154 |
System.out.println(TXMCoreMessages.Toolbox_29); |
155 |
if (cqiClient instanceof NetCqiClient) System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE) + " " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE) + TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE) + " " + Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE))); //$NON-NLS-1$ //$NON-NLS-2$
|
|
155 |
if (cqiClient instanceof NetCqiClient) System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(CQPPreferences.CQI_SERVER_LOGIN, CQPPreferences.PREFERENCES_NODE) + " " + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PASSWORD, CQPPreferences.PREFERENCES_NODE) + TXMPreferences.getString(CQPPreferences.CQI_SERVER_HOST, CQPPreferences.PREFERENCES_NODE) + " " + Integer.parseInt(TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE))); //$NON-NLS-1$ //$NON-NLS-2$
|
|
156 | 156 |
if (cqiServer != null && cqiServer instanceof NetCqiServer) |
157 | 157 |
System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine()); |
158 | 158 |
} else { |
... | ... | |
300 | 300 |
* kill cqpserver process. |
301 | 301 |
*/ |
302 | 302 |
private static void killSearchEngine() { |
303 |
if (!TXMPreferences.getBoolean(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE))
|
|
303 |
if (!TXMPreferences.getBoolean(CQPPreferences.CQI_SERVER_IS_REMOTE, CQPPreferences.PREFERENCES_NODE))
|
|
304 | 304 |
// Windows OS |
305 | 305 |
if (OSDetector.isFamilyWindows()) { |
306 | 306 |
try { |
... | ... | |
333 | 333 |
} |
334 | 334 |
// Mac, Linux |
335 | 335 |
else { |
336 |
String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE) + TXMCoreMessages.Toolbox_38;
|
|
336 |
String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(CQPPreferences.CQI_SERVER_PORT, CQPPreferences.PREFERENCES_NODE) + TXMCoreMessages.Toolbox_38;
|
|
337 | 337 |
try { |
338 | 338 |
//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$ |
339 | 339 |
// System.out.println("kill `ps aux | grep cqpserver | awk '/-P " |
340 |
// + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
340 |
// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
341 | 341 |
// String[] args = |
342 | 342 |
// {"kill","`ps aux | grep cqpserver | awk '/-P " + |
343 |
// TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`"};
|
|
343 |
// TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`"};
|
|
344 | 344 |
// System.out.println("before Sh constructor"); |
345 | 345 |
Sh sh = new Sh(""); //$NON-NLS-1$ |
346 | 346 |
// System.out.println("after Sh constructor"); |
347 | 347 |
// System.out.println("EXECUTE SH : "+"kill `ps aux | grep cqpserver | awk '/-P " |
348 |
// + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
348 |
// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
349 | 349 |
sh.setIsc(cmd); |
350 | 350 |
sh.sh(); |
351 | 351 |
// Runtime.getRuntime().exec("sh kill `ps aux | grep cqpserver | awk '/-P " |
352 |
// + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
352 |
// + TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQI_SERVER_PORT) + "/ {print $2}'`");
|
|
353 | 353 |
|
354 | 354 |
} catch (Exception e) { |
355 | 355 |
Log.severe(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e)); |
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java (revision 509) | ||
---|---|---|
38 | 38 |
import org.txm.Toolbox; |
39 | 39 |
import org.txm.core.messages.TXMCoreMessages; |
40 | 40 |
import org.txm.core.preferences.TBXPreferences; |
41 |
import org.txm.searchengine.cqp.CQPPreferences; |
|
41 | 42 |
import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException; |
42 | 43 |
import org.txm.stat.utils.ConsoleProgressBar; |
43 | 44 |
import org.txm.utils.OSDetector; |
... | ... | |
180 | 181 |
*/ |
181 | 182 |
|
182 | 183 |
// Warning !! for WINDOWS ONLY the "" value does not work with the ProcessBuilder we must set the value to "\"\"" |
183 |
String empty_value_code = Toolbox.getParam(TBXPreferences.CQP_EMPTY_VALUE_CODE);
|
|
184 |
String empty_value_code = Toolbox.getParam(CQPPreferences.CQP_EMPTY_VALUE_CODE);
|
|
184 | 185 |
if (OSDetector.isFamilyWindows()) { |
185 | 186 |
if (empty_value_code == null) empty_value_code = "\"\""; |
186 | 187 |
empty_value_code = empty_value_code.trim(); |
tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java (revision 509) | ||
---|---|---|
38 | 38 |
import org.apache.commons.lang.StringUtils; |
39 | 39 |
import org.txm.core.messages.TXMCoreMessages; |
40 | 40 |
import org.txm.core.preferences.TBXPreferences; |
41 |
import org.txm.searchengine.cqp.CQPPreferences; |
|
41 | 42 |
import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException; |
42 | 43 |
import org.txm.utils.logger.Log; |
43 | 44 |
|
... | ... | |
242 | 243 |
*/ |
243 | 244 |
public static String getCWBLocation() |
244 | 245 |
{ |
245 |
String cwbLoc = org.txm.Toolbox.getParam(TBXPreferences.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
|
|
246 |
String cwbLoc = org.txm.Toolbox.getParam(CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
|
|
246 | 247 |
|
247 | 248 |
if (!new File(cwbLoc).exists()) { |
248 | 249 |
System.out.println(TXMCoreMessages.CwbProcess_5+cwbLoc); |
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPPreferences.java (revision 509) | ||
---|---|---|
1 |
package org.txm.libs.cqp; |
|
2 |
|
|
3 |
import org.eclipse.core.runtime.preferences.DefaultScope; |
|
4 |
import org.osgi.service.prefs.Preferences; |
|
5 |
import org.txm.core.preferences.TXMPreferences; |
|
6 |
|
|
7 |
public class CQPPreferences extends TXMPreferences { |
|
8 |
|
|
9 |
public static final String PREFERENCES_NODE = "cwbinstaller"; |
|
10 |
|
|
11 |
public static final String VERSION = "cwbinstaller.commands.version"; |
|
12 |
|
|
13 |
@Override |
|
14 |
public void initializeDefaultPreferences() { |
|
15 |
Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE); |
|
16 |
preferences.put(VERSION, "0.0"); |
|
17 |
} |
|
18 |
} |
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java (revision 509) | ||
---|---|---|
1 |
package org.txm.libs.cqp; |
|
2 |
|
|
3 |
import org.eclipse.core.runtime.preferences.DefaultScope; |
|
4 |
import org.osgi.framework.FrameworkUtil; |
|
5 |
import org.osgi.service.prefs.Preferences; |
|
6 |
import org.txm.core.messages.TXMCoreMessages; |
|
7 |
import org.txm.core.preferences.TBXPreferences; |
|
8 |
import org.txm.core.preferences.TXMPreferences; |
|
9 |
import org.txm.utils.logger.Log; |
|
10 |
|
|
11 |
public class CQPLibPreferences extends TXMPreferences { |
|
12 |
|
|
13 |
public static String PREFERENCES_NODE = FrameworkUtil.getBundle(CQPLibPreferences.class).getSymbolicName(); |
|
14 |
|
|
15 |
/** The Constant CQI_SERVER_PATH_TO_EXECUTABLE. */ |
|
16 |
public static final String VERSION = "version"; //$NON-NLS-1$ |
|
17 |
|
|
18 |
|
|
19 |
/** The Constant CQI_SERVER_PATH_TO_EXECUTABLE. */ |
|
20 |
public static final String CQI_SERVER_PATH_TO_EXECUTABLE = "cqi_server_path_to_executable"; //$NON-NLS-1$ |
|
21 |
|
|
22 |
public static final String CQI_SERVER_PATH_TO_CQPLIB = "cqi_server_path_to_cqplib"; //$NON-NLS-1$ |
|
23 |
|
|
24 |
/** The Constant CQI_SERVER_PATH_TO_INIT_FILE. */ |
|
25 |
public static final String CQI_SERVER_PATH_TO_INIT_FILE = "cqi_server_path_to_init_file"; //$NON-NLS-1$ |
|
26 |
|
|
27 |
@Override |
|
28 |
public void initializeDefaultPreferences() { |
|
29 |
Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); |
|
30 |
|
|
31 |
Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE); |
|
32 |
|
|
33 |
} |
|
34 |
} |
|
0 | 35 |
tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/DoInstallStep.java (revision 509) | ||
---|---|---|
28 | 28 |
public void preInstall() { |
29 | 29 |
|
30 | 30 |
String CQPFRAGMENT = "org.txm.libs.cqp."+System.getProperty("osgi.os"); |
31 |
|
|
31 |
//TODO: fix preferneces logic between org.txm.cqp.lib et org.txm.searchengine.cqp |
|
32 | 32 |
Log.info("CQP.DoInstallStep.preInstall()"); |
33 |
String saved = TXMPreferences.getString(CQPPreferences.VERSION, CQPPreferences.PREFERENCES_NODE);
|
|
33 |
String saved = TXMPreferences.getString(CQPLibPreferences.VERSION, CQPLibPreferences.PREFERENCES_NODE);
|
|
34 | 34 |
Version currentVersion = BundleUtils.getBundleVersion(CQPFRAGMENT); // the CQPFRAGMENT plugin contains the right version |
35 | 35 |
|
36 | 36 |
if (saved != null && saved.length() > 0) { |
... | ... | |
80 | 80 |
|
81 | 81 |
File execFile = new File(OSDir, "cqpserver"+ext); |
82 | 82 |
|
83 |
TXMPreferences.putString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
|
|
84 |
TXMPreferences.putString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
|
|
85 |
TXMPreferences.putString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
|
|
83 |
TXMPreferences.putString(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, OSDir.getAbsolutePath());
|
|
84 |
TXMPreferences.putString(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, initFile.getAbsolutePath());
|
|
85 |
TXMPreferences.putString(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, execFile.getAbsolutePath());
|
|
86 | 86 |
if (!Util.isWindows()) { |
87 | 87 |
try { |
88 | 88 |
Log.info("Setting execution file rights to: "+OSDir.getAbsolutePath()); |
... | ... | |
105 | 105 |
} |
106 | 106 |
|
107 | 107 |
Log.warning("SearchEngine preferences set with: "+OSDir.getAbsolutePath()+ ", "+initFile.getAbsolutePath()+ " and "+execFile.getAbsolutePath()); |
108 |
TXMPreferences.putString(CQPPreferences.PREFERENCES_NODE, CQPPreferences.VERSION, currentVersion.toString());
|
|
108 |
TXMPreferences.putString(CQPLibPreferences.PREFERENCES_NODE, CQPLibPreferences.VERSION, currentVersion.toString());
|
|
109 | 109 |
} |
110 | 110 |
} |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java (revision 509) | ||
---|---|---|
53 | 53 |
import org.osgi.framework.ServiceReference; |
54 | 54 |
import org.txm.core.preferences.TBXPreferences; |
55 | 55 |
import org.txm.core.preferences.TXMPreferences; |
56 |
import org.txm.searchengine.cqp.CQPPreferences; |
|
56 | 57 |
import org.txm.statsengine.r.core.preferences.RPreferences; |
57 | 58 |
import org.txm.utils.logger.Log; |
58 | 59 |
|
... | ... | |
216 | 217 |
private boolean parseCommandLine() { |
217 | 218 |
boolean exit = false; |
218 | 219 |
String[] optionsForPreferences = { |
219 |
TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE,
|
|
220 |
TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE,
|
|
220 |
CQPPreferences.CQI_SERVER_PATH_TO_EXECUTABLE,
|
|
221 |
CQPPreferences.CQI_SERVER_PATH_TO_INIT_FILE,
|
|
221 | 222 |
// TBXPreferences.CQI_SERVER_PATH_TO_REGISTRY, |
222 | 223 |
RPreferences.PATH_TO_EXECUTABLE, |
223 | 224 |
TBXPreferences.INSTALL_DIR }; |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java (revision 509) | ||
---|---|---|
48 | 48 |
import org.txm.rcp.Application; |
49 | 49 |
import org.txm.rcp.Messages; |
50 | 50 |
import org.txm.rcp.TxmPreferences; |
51 |
import org.txm.searchengine.cqp.CQPPreferences; |
|
51 | 52 |
// TODO: Auto-generated Javadoc |
52 | 53 |
/** |
53 | 54 |
* The Class ExportPreferencePage. |
... | ... | |
146 | 147 |
l.setLayoutData(ldata); |
147 | 148 |
addField(defaultlang); |
148 | 149 |
|
149 |
empty_code = new StringFieldEditor(TBXPreferences.CQP_EMPTY_VALUE_CODE, "Empty property value code", getFieldEditorParent());
|
|
150 |
empty_code = new StringFieldEditor(CQPPreferences.CQP_EMPTY_VALUE_CODE, "Empty property value code", getFieldEditorParent());
|
|
150 | 151 |
addField(empty_code); |
151 | 152 |
|
152 | 153 |
} |
tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/CQPPreferencePage.java (revision 509) | ||
---|---|---|
45 | 45 |
import org.txm.core.preferences.TBXPreferences; |
46 | 46 |
import org.txm.rcp.Application; |
47 | 47 |
import org.txm.rcp.Messages; |
48 |
import org.txm.searchengine.cqp.CQPPreferences; |
|
48 | 49 |
// TODO: Auto-generated Javadoc |
49 | 50 |
/** |
50 | 51 |
* This class represents a preference page that is contributed to the |
... | ... | |
105 | 106 |
@Override |
106 | 107 |
public void createFieldEditors() { |
107 | 108 |
|
108 |
cqi_use_network = new BooleanFieldEditor(TBXPreferences.CQI_NETWORK_MODE,
|
|
109 |
cqi_use_network = new BooleanFieldEditor(CQPPreferences.CQI_NETWORK_MODE,
|
|
109 | 110 |
Messages.CQPPreferencePage_1, |
110 | 111 |
BooleanFieldEditor.DEFAULT, getFieldEditorParent()); |
111 | 112 |
cqi_server_path_to_cqplib = new DirectoryFieldEditor( |
112 |
TBXPreferences.CQI_SERVER_PATH_TO_CQPLIB, Messages.CQPPreferencePage_0,
|
|
113 |
CQPPreferences.CQI_SERVER_PATH_TO_CQPLIB, Messages.CQPPreferencePage_0,
|
|
113 | 114 |
getFieldEditorParent()); |
114 |
cqi_server_is_remote = new BooleanFieldEditor(TBXPreferences.CQI_SERVER_IS_REMOTE,
|
|
115 |
cqi_server_is_remote = new BooleanFieldEditor(CQPPreferences.CQI_SERVER_IS_REMOTE,
|
|
115 | 116 |
Messages.CQPPreferencePage_10, |
116 | 117 |
BooleanFieldEditor.DEFAULT, getFieldEditorParent()); |
117 |
cqi_server_host = new StringFieldEditor(TBXPreferences.CQI_SERVER_HOST,
|
|
118 |
cqi_server_host = new StringFieldEditor(CQPPreferences.CQI_SERVER_HOST,
|
|
118 | 119 |
Messages.CQPPreferencePage_11, getFieldEditorParent()); |
119 | 120 |
|
120 |
cqi_server_port = new IntegerFieldEditor(TBXPreferences.CQI_SERVER_PORT,
|
|
121 |
cqi_server_port = new IntegerFieldEditor(CQPPreferences.CQI_SERVER_PORT,
|
|
121 | 122 |
Messages.CQPPreferencePage_12, getFieldEditorParent()); |
122 | 123 |
|
123 |
cqi_server_user = new StringFieldEditor(TBXPreferences.CQI_SERVER_LOGIN,
|
|
124 |
cqi_server_user = new StringFieldEditor(CQPPreferences.CQI_SERVER_LOGIN,
|
|
124 | 125 |
Messages.CQPPreferencePage_13, getFieldEditorParent()); |
125 | 126 |
|
126 |
cqi_server_password = new StringFieldEditor(TBXPreferences.CQI_SERVER_PASSWORD,
|
|
127 |
cqi_server_password = new StringFieldEditor(CQPPreferences.CQI_SERVER_PASSWORD,
|
|
127 | 128 |
Messages.CQPPreferencePage_14, getFieldEditorParent()); |
128 | 129 |
|
129 | 130 |
cqi_server_path_to_executable = new FileFieldEditor( |
130 |
TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, Messages.CQPPreferencePage_15,
|
|
131 |
CQPPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, Messages.CQPPreferencePage_15,
|
|
131 | 132 |
getFieldEditorParent()); |
132 | 133 |
|
133 | 134 |
// cqi_server_path_to_registry = new DirectoryFieldEditor( |
134 | 135 |
// CQI_SERVER_PATH_TO_REGISTRY, Messages.CQPPreferencePage_16, |
135 | 136 |
// getFieldEditorParent()); |
136 | 137 |
cqi_server_path_to_init_file = new FileFieldEditor( |
137 |
TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE, Messages.CQPPreferencePage_17,
|
|
138 |
CQPPreferences.CQI_SERVER_PATH_TO_INIT_FILE, Messages.CQPPreferencePage_17,
|
|
138 | 139 |
getFieldEditorParent()); |
139 | 140 |
cqi_server_additional_options = new StringFieldEditor( |
140 |
TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, Messages.CQPPreferencePage_18,
|
|
141 |
CQPPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, Messages.CQPPreferencePage_18,
|
|
141 | 142 |
getFieldEditorParent()); |
142 | 143 |
|
143 | 144 |
addField(cqi_use_network); |
... | ... | |
154 | 155 |
|
155 | 156 |
Preferences preferences = org.eclipse.core.runtime.preferences.InstanceScope.INSTANCE.getNode(Application.PLUGIN_ID); |
156 | 157 |
boolean useNetwork = preferences.getBoolean( |
157 |
TBXPreferences.CQI_NETWORK_MODE,
|
|
158 |
CQPPreferences.CQI_NETWORK_MODE,
|
|
158 | 159 |
false); |
159 | 160 |
boolean serverIsRemote = preferences.getBoolean( |
160 |
TBXPreferences.CQI_SERVER_IS_REMOTE,
|
|
161 |
CQPPreferences.CQI_SERVER_IS_REMOTE,
|
|
161 | 162 |
false); |
162 | 163 |
updateFieldsState(useNetwork, serverIsRemote); |
163 | 164 |
} |
... | ... | |
213 | 214 |
*/ |
214 | 215 |
@Override |
215 | 216 |
public void init(IWorkbench workbench) { |
216 |
this.setPreferenceStore(new TXMPreferenceStore(TBXPreferences.PREFERENCES_NODE));
|
|
217 |
this.setPreferenceStore(new TXMPreferenceStore(CQPPreferences.PREFERENCES_NODE));
|
|
217 | 218 |
} |
218 | 219 |
|
219 | 220 |
/* (non-Javadoc) |
... | ... | |
225 | 226 |
boolean serverIsRemote = false; |
226 | 227 |
boolean update = false; |
227 | 228 |
if (((FieldEditor) event.getSource()).getPreferenceName().equals( |
228 |
TBXPreferences.CQI_SERVER_IS_REMOTE)) {
|
|
229 |
CQPPreferences.CQI_SERVER_IS_REMOTE)) {
|
|
229 | 230 |
useNetwork = cqi_use_network.getBooleanValue(); |
230 | 231 |
serverIsRemote = (Boolean) event.getNewValue(); |
231 | 232 |
update = true; |
232 | 233 |
} else if (((FieldEditor) event.getSource()).getPreferenceName().equals( |
233 |
TBXPreferences.CQI_NETWORK_MODE)) {
|
|
234 |
CQPPreferences.CQI_NETWORK_MODE)) {
|
|
234 | 235 |
useNetwork = (Boolean) event.getNewValue(); |
235 | 236 |
serverIsRemote = cqi_server_is_remote.getBooleanValue(); |
236 | 237 |
update = true; |
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 509) | ||
---|---|---|
21 | 21 |
public static final String EXPERT_USER = "txm_expert_user"; //$NON-NLS-1$ |
22 | 22 |
public static final String LOG_STACKTRACE = "log_stacktrace"; //$NON-NLS-1$ |
23 | 23 |
|
24 |
/** The Constant CQI_SERVER_HOST. */ |
|
25 |
public static final String CQI_SERVER_HOST = "cqi_server_host"; //$NON-NLS-1$ |
|
26 |
|
|
27 |
/** The Constant CQI_SERVER_PORT. */ |
|
28 |
public static final String CQI_SERVER_PORT = "cqi_server_port"; //$NON-NLS-1$ |
|
29 |
|
|
30 |
/** The Constant CQI_SERVER_LOGIN. */ |
|
31 |
public static final String CQI_SERVER_LOGIN = "cqi_server_login"; //$NON-NLS-1$ |
|
32 |
|
|
33 |
/** The Constant CQI_SERVER_PASSWORD. */ |
|
34 |
public static final String CQI_SERVER_PASSWORD = "cqi_server_password"; //$NON-NLS-1$ |
|
35 |
|
|
36 |
/** The Constant CQI_SERVER_PATH_TO_EXECUTABLE. */ |
|
37 |
public static final String CQI_SERVER_PATH_TO_EXECUTABLE = "cqi_server_path_to_executable"; //$NON-NLS-1$ |
|
38 |
|
|
39 |
public static final String CQI_SERVER_PATH_TO_CQPLIB = "cqi_server_path_to_cqplib"; //$NON-NLS-1$ |
|
40 |
|
|
41 |
/** The Constant CQI_SERVER_PATH_TO_INIT_FILE. */ |
|
42 |
public static final String CQI_SERVER_PATH_TO_INIT_FILE = "cqi_server_path_to_init_file"; //$NON-NLS-1$ |
|
43 |
|
|
44 |
/** The Constant CQI_SERVER_ADDITIONAL_OPTIONS. */ |
|
45 |
public static final String CQI_SERVER_ADDITIONAL_OPTIONS = "cqi_server_additional_options"; //$NON-NLS-1$ |
|
46 |
|
|
47 |
/** The Constant CQI_SERVER_MONITOR_OUTPUT. */ |
|
48 |
public static final String CQI_SERVER_MONITOR_OUTPUT = "cqi_server_monitor_output"; //$NON-NLS-1$ |
|
49 |
|
|
50 |
/** The Constant CQI_SERVER_IS_REMOTE. */ |
|
51 |
public static final String CQI_SERVER_IS_REMOTE = "cqi_server_is_remote"; //$NON-NLS-1$ |
|
52 |
|
|
53 |
/** The Constant CQI_SERVER_MODE. */ |
|
54 |
public static final String CQI_NETWORK_MODE = "cqi_server_mode"; //$NON-NLS-1$ |
|
55 |
|
|
56 |
public static final String CQP_EMPTY_VALUE_CODE = "cqp_empty_value_code"; |
|
57 |
|
|
58 | 24 |
/** The Constant SCRIPT_ROOT_DIR. */ |
59 | 25 |
public static final String SCRIPT_ROOT_DIR = "script_root_dir"; //$NON-NLS-1$ |
60 | 26 |
|
... | ... | |
95 | 61 |
public static final String EXPORT_COLSEPARATOR = "export_colseparator"; //$NON-NLS-1$ |
96 | 62 |
/** The Constant EXPORT_TXTSEPARATOR. */ |
97 | 63 |
public static final String EXPORT_TXTSEPARATOR = "export_txtseparator"; //$NON-NLS-1$ |
98 |
|
|
99 |
/** Contains all the parameters keys. */ |
|
100 |
public static final String[] existingKeys = { LOG_LEVEL, LOG_STACKTRACE, ADD_TECH_LOGS, LOG_DIR, |
|
101 |
LOG_IN_FILE, CQI_SERVER_HOST, CQI_SERVER_PORT, CQI_SERVER_LOGIN, |
|
102 |
CQI_SERVER_PASSWORD, CQI_SERVER_PATH_TO_EXECUTABLE,CQI_SERVER_PATH_TO_CQPLIB, |
|
103 |
CQI_SERVER_ADDITIONAL_OPTIONS, CQI_SERVER_MONITOR_OUTPUT, |
|
104 |
CQI_SERVER_IS_REMOTE, CQI_NETWORK_MODE, CQP_EMPTY_VALUE_CODE, SCRIPT_ROOT_DIR, |
|
105 |
SCRIPT_CURRENT_DIR, UI_LOCALE, WORKSPACE_LOCATION, INSTALL_DIR, |
|
106 |
USER_TXM_HOME, |
|
107 |
// IS_R_MANDATORY, R_PATH_TO_EXECUTABLE, R_DEBUG, R_REMOTE, R_SERVER_ADDRESS, |
|
108 |
// R_PORT, R_USER, R_PASSWORD, R_PACKAGES_PATH, R_RARGS, R_RSERVEARGS, R_DISABLE, R_FILE_TRANSFERT,R_SVG_DEVICE, |
|
109 | 64 |
|
110 |
TREETAGGER_INSTALL_PATH, TREETAGGER_MODELS_PATH,TREETAGGER_OPTIONS, TREETAGGER_APOSTROPHE, |
|
111 |
METADATA_ENCODING, METADATA_COLSEPARATOR,METADATA_TXTSEPARATOR |
|
112 | 65 |
|
113 |
}; |
|
114 |
|
|
115 | 66 |
public static String getID() { |
116 | 67 |
return "org.txm.core"; |
117 | 68 |
} |
... | ... | |
127 | 78 |
preferences.put(TBXPreferences.WORKSPACE_LOCATION, System.getProperty("user.home")+"/TXM/workspaces/default.xml"); |
128 | 79 |
|
129 | 80 |
preferences.putBoolean(TBXPreferences.EXPERT_USER, false); //$NON-NLS-1$ |
81 |
|
|
130 | 82 |
preferences.put(TBXPreferences.LOG_LEVEL, "OFF"); //$NON-NLS-1$ |
131 | 83 |
preferences.putBoolean(TBXPreferences.ADD_TECH_LOGS, false); //$NON-NLS-1$ |
132 | 84 |
preferences.putBoolean(TBXPreferences.LOG_STACKTRACE, true); //$NON-NLS-1$ |
133 | 85 |
preferences.putBoolean(TBXPreferences.LOG_IN_FILE, false); //$NON-NLS-1$ |
134 |
preferences.put(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, "-b 1000000 -d OFF"); //$NON-NLS-1$ |
|
135 |
preferences.put(TBXPreferences.CQI_SERVER_PORT, "4877"); //$NON-NLS-1$ |
|
136 |
preferences.put(TBXPreferences.CQI_SERVER_HOST, "localhost"); //$NON-NLS-1$ |
|
137 |
preferences.put(TBXPreferences.CQI_SERVER_LOGIN, "anonymous"); //$NON-NLS-1$ |
|
138 |
preferences.put(TBXPreferences.CQI_SERVER_PASSWORD, ""); //$NON-NLS-1$ |
|
139 |
preferences.put(TBXPreferences.CQI_SERVER_IS_REMOTE, "" + false); //$NON-NLS-1$ |
|
140 |
preferences.putBoolean(TBXPreferences.CQI_NETWORK_MODE, false); //$NON-NLS-1$ |
|
141 |
preferences.put(TBXPreferences.CQP_EMPTY_VALUE_CODE, ""); //$NON-NLS-1$ |
|
142 | 86 |
preferences.put(TBXPreferences.UI_LOCALE, "fr"); //$NON-NLS-1$ |
87 |
|
|
143 | 88 |
preferences.put(TBXPreferences.TREETAGGER_INSTALL_PATH, System.getProperty("osgi.user.area") + "/TXM/treetagger"); //$NON-NLS-1$ //$NON-NLS-2$ |
144 | 89 |
preferences.put(TBXPreferences.TREETAGGER_MODELS_PATH, TXMPreferences.getString(TBXPreferences.TREETAGGER_INSTALL_PATH, TBXPreferences.PREFERENCES_NODE) + "/models"); //$NON-NLS-1$ |
145 | 90 |
preferences.put(TBXPreferences.TREETAGGER_APOSTROPHE, "false"); //$NON-NLS-1$ |
91 |
|
|
146 | 92 |
preferences.put(TBXPreferences.METADATA_ENCODING, "UTF-8"); //$NON-NLS-1$ |
147 | 93 |
preferences.put(TBXPreferences.METADATA_TXTSEPARATOR, "\""); //$NON-NLS-1$ |
148 | 94 |
|
Formats disponibles : Unified diff