Révision 867

tmp/org.txm.core/src/java/org/txm/ToolboxOld.java (revision 867)
134 134
		}
135 135
	
136 136
		try {
137
			Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
138 137

  
139 138
			// initialize workspace : list of corpus loaded in TXM
140 139
			stateWorkspace = startWorkspace();
tmp/org.txm.core/src/java/org/txm/Toolbox.java (revision 867)
166 166
	 * @return the TXM working directory set with the USER_TXM_HOME preference key 
167 167
	 */
168 168
	public static String getTXMHOMEPATH() {
169
		return TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
169
		return getPreference(TBXPreferences.USER_TXM_HOME);
170 170
	}
171 171

  
172 172
	/**
......
223 223
		}
224 224

  
225 225
		try {
226
			Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
227 226

  
228 227
			// initialize workspace : list of corpus loaded in TXM
229 228
			// copy shared files if needed
......
231 230

  
232 231

  
233 232
			Log.warning("Initializing logger...");
234
			Log.setLevel(Level.parse(TXMPreferences.getString(TBXPreferences.LOG_LEVEL, TBXPreferences.PREFERENCES_NODE)));
233
			Log.setLevel(Level.parse(getPreference(TBXPreferences.LOG_LEVEL)));
235 234
			Log.setPrintInConsole(TXMPreferences.getBoolean(TBXPreferences.ADD_TECH_LOGS, TBXPreferences.PREFERENCES_NODE));
236 235

  
237
			if (!TXMPreferences.getString(TBXPreferences.LOG_DIR, TBXPreferences.PREFERENCES_NODE).isEmpty()) {
238
				Log.setPrintInFile(TXMPreferences.getBoolean(TBXPreferences.LOG_IN_FILE, TBXPreferences.PREFERENCES_NODE), new File(TXMPreferences.getString(TBXPreferences.LOG_DIR, TBXPreferences.PREFERENCES_NODE)));
236
			if (!getPreference(TBXPreferences.LOG_DIR).isEmpty()) {
237
				Log.setPrintInFile(TXMPreferences.getBoolean(TBXPreferences.LOG_IN_FILE, TBXPreferences.PREFERENCES_NODE), new File(getPreference(TBXPreferences.LOG_DIR)));
239 238
			}
240 239
			else {
241 240
				Log.setPrintInFile(TXMPreferences.getBoolean(TBXPreferences.LOG_IN_FILE, TBXPreferences.PREFERENCES_NODE));
......
268 267
		}
269 268

  
270 269

  
271
		// FIXME: persistence tests
272
		if (TBXPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) {
270
		// FIXME: tmp persistence tests: Reload saved results
271
		if (TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
273 272
			Log.finest("Toolbox.initialize(): reloading persitent results...");
274 273
			ArrayList<String> resultsNodesQualifiers = TXMPreferences.getAllResultsNodesQualifiers();
275 274
			for (String nodeQualifier : resultsNodesQualifiers) {
......
346 345
			while (line != null) {
347 346
				String[] split = line.split("="); //$NON-NLS-1$
348 347
				if (split.length == 2) {
349
					TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, split[0], split[1]);
348
					setPreference(split[0], split[1]);
350 349
				} else if (split.length > 2) {
351 350
					String[] subsplit = new String[split.length - 1];
352 351
					System.arraycopy(split, 1, subsplit, 0, split.length - 1);
353
					TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, split[0], StringUtils.join(subsplit, "="));
352
					setPreference(split[0], StringUtils.join(subsplit, "="));
354 353
				}
355 354
				line = input.readLine();
356 355
			}
......
488 487

  
489 488
		stopEnginesManagers();
490 489

  
491
		if(Toolbox.workspace != null)
490
		
491
		// FIXME: tmp solution before IProject: remove all not persistable result nodes
492
		TXMPreferences.deleteAllNotPersistableResultsNodes();
493
		// FIXME: tmp solution before IProject: remove result local nodes if persistence preference is disabled
494
		if (!TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
495
			TXMPreferences.deleteAllResultsNodes();
496
		}
497

  
498
		
499
		if(Toolbox.workspace != null) {
492 500
			Toolbox.workspace.save();
501
		}
493 502
		Toolbox.workspace = null;
494 503
		state = false;
495 504

  
......
498 507
		try {
499 508
			
500 509
			
501
			// FIXME: tmp solution before IProject: remove all not persistable result nodes
502
			TXMPreferences.deleteAllNotPersistableResultsNodes();
503 510
			
504
			// FIXME: tmp solution before IProject: remove result local nodes if persistence preference is disabled
505
			if (!TBXPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) {
506
				TXMPreferences.deleteAllResultsNodes();
507
			}
508

  
509
			
510 511
			service.getRootNode().flush();
511 512
			//		.childrenNames()) {
512 513
			//			System.out.println("********************************************************************************************************"); //$NON-NLS-1$
......
583 584

  
584 585
	
585 586
	private static boolean startWorkspace(IProgressMonitor monitor) {
586
		String txmhomedir = TXMPreferences.getString(TBXPreferences.USER_TXM_HOME, TBXPreferences.PREFERENCES_NODE);
587
		String txmhomedir = getPreference(TBXPreferences.USER_TXM_HOME);
587 588
		if (txmhomedir == null || txmhomedir.length() == 0) {
588 589
			state = false;
589 590
			return false;
......
593 594
		
594 595
		Version currentVersion = BundleUtils.getBundleVersion("org.txm.core");
595 596
		Log.info("Current toolbox version: " + currentVersion + ".");
596
		String installedVersionString = TXMPreferences.getString(TBXPreferences.VERSION, TBXPreferences.PREFERENCES_NODE);
597
		String installedVersionString = getPreference(TBXPreferences.VERSION);
597 598
		if (installedVersionString.isEmpty()) {
598 599
			installedVersionString = "0.0.0";
599 600
		}
......
604 605
			//System.out.println("Toolbox.startWorkspace(): workspace location = " + location);
605 606

  
606 607
			boolean doUpdateworkspace = currentVersion.compareTo(installedVersion) > 0;
607
			
608
			if (!new File(location).exists() // no directory
609
				) {
608

  
609
			// no directory
610
			if (!new File(location).exists()) {
610 611
				
611 612
				Log.info(TXMCoreMessages.Toolbox_10 + location); 
612 613

  
......
619 620
					return false;
620 621
				}
621 622
				
622
				TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.VERSION, currentVersion.toString());
623
			} else if (doUpdateworkspace // newer install
624
					) {
623
				setPreference(TBXPreferences.VERSION, currentVersion.toString());
624
			}
625
			 // newer install
626
			else if (doUpdateworkspace) {
625 627
				Log.info("Updating Toolbox workspace...");
626 628

  
627 629
				// create or update the workspace & create TXM default.xml workspace file
......
632 634
					Log.severe("Error: workspace not created (is null).");
633 635
					return false;
634 636
				}
635
				
636
				TXMPreferences.put(TBXPreferences.PREFERENCES_NODE, TBXPreferences.VERSION, currentVersion.toString());
637
				setPreference(TBXPreferences.VERSION, currentVersion.toString());
637 638
			} else { // already existing workspace
638 639
				workspace = new Workspace(new File(location));
639 640
			}
......
650 651
				//System.out.println(TXMCoreMessages.DONE);
651 652
			}
652 653
		} catch (Exception e) {
653
			System.err.println(TXMCoreMessages.Toolbox_workspace_init_failed + location); 
654
			Log.severe(TXMCoreMessages.Toolbox_workspace_init_failed + location); 
654 655
			Log.severe(TXMCoreMessages.Toolbox_15 + Log.toString(e));
655 656
			Log.printStackTrace(e);
656 657
			state = false;
......
692 693
	
693 694

  
694 695
	public static String getMetadataEncoding() {
695
		return TBXPreferences.getString(TBXPreferences.METADATA_ENCODING, TBXPreferences.PREFERENCES_NODE);
696
		return getPreference(TBXPreferences.METADATA_ENCODING);
696 697
	}
697 698
	public static String getMetadataColumnSeparator(){
698
		return TBXPreferences.getString(TBXPreferences.METADATA_COLSEPARATOR, TBXPreferences.PREFERENCES_NODE);
699
		return getPreference(TBXPreferences.METADATA_COLSEPARATOR);
699 700
	}
700 701
	public static String getMetadataTextSeparator() {
701
		return TBXPreferences.getString(TBXPreferences.METADATA_TXTSEPARATOR, TBXPreferences.PREFERENCES_NODE);
702
		return getPreference(TBXPreferences.METADATA_TXTSEPARATOR);
702 703
	}
703 704
}
tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java (revision 867)
1110 1110
	public static void deleteAllNotPersistableResultsNodes()	{
1111 1111
		ArrayList<String> resultsNodesQualifier = getAllResultsNodesQualifiers();
1112 1112
		for (int i = 0; i < resultsNodesQualifier.size(); i++) {
1113
			if(!TXMResult.getResult(resultsNodesQualifier.get(i)).isPersistable())	{
1113
			TXMResult result = TXMResult.getResult(resultsNodesQualifier.get(i)); 
1114
			if(result != null && !result.isPersistable())	{
1114 1115
				delete(scope.getNode(resultsNodesQualifier.get(i)));
1115 1116
			}
1116 1117
		}
......
1167 1168
	 */
1168 1169
	public static String findNodeQualifier(String nodeQualifier, TXMResult result, String key)	{
1169 1170

  
1170
		//if (result == null) return nodeQualifier;
1171
		
1172 1171
		boolean keyExists = (result != null && resultScopeKeyExists(result, key));
1173 1172

  
1174 1173
		// get the result scope preference
......
1188 1187

  
1189 1188
		if (nodeQualifier == null)	{
1190 1189
			try {
1191
				System.err.println("TXMPreferences.findNodeQualifier(): no node qualifier has been founded (key = " + key + ", TXMResult = " + result + ").");
1190
				Log.severe("TXMPreferences.findNodeQualifier(): no node qualifier has been founded (key = " + key + ", TXMResult = " + result + ").");
1192 1191
			}
1193 1192
			catch(Exception e) {
1194 1193
			}
tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java (revision 867)
62 62
	
63 63
	
64 64
	/**
65
	 * To auto save or not the results after a compute.
65
	 * To enable/disable the results persistence (save after a computing and load at Toolbox start).
66 66
	 */
67
	public static final String AUTO_SAVE_RESULTS = "auto_save_results"; //$NON-NLS-1$
67
	public static final String PERSISTENCE_ENABLED = "persistence_enabled"; //$NON-NLS-1$
68 68

  
69 69
	
70
	
71
	public static String getID() {
72
		return "org.txm.core";
73
	}
74 70

  
75 71
	@Override
76 72
	public void initializeDefaultPreferences() {
77
		Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
78 73

  
79 74
		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
80 75
		
......
100 95
		preferences.putBoolean(EXPORT_SHOW, false);
101 96
		
102 97
		preferences.putBoolean(SHOW_ALL_RESULT_NODES, false);
103
		preferences.putBoolean(AUTO_SAVE_RESULTS, false);
98
		preferences.putBoolean(PERSISTENCE_ENABLED, false);
104 99
	}
105 100
}
tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java (revision 867)
1625 1625
		}
1626 1626

  
1627 1627
		// FIXME: file persistence flush tests
1628
		if (this.persistable && TBXPreferences.getBoolean(TBXPreferences.AUTO_SAVE_RESULTS, TBXPreferences.PREFERENCES_NODE)) {
1628
		if (this.persistable && TBXPreferences.getBoolean(TBXPreferences.PERSISTENCE_ENABLED, TBXPreferences.PREFERENCES_NODE)) {
1629 1629
			Log.finest("TXMResult.compute(): flushing local preferences node in file for persistence tests.");
1630 1630
			TXMPreferences.flush(this);
1631 1631
		}
tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties (revision 867)
84 84

  
85 85
Error_CONNECTION_FAILED = ** Error : while connection to search engine, with the following parameters: 
86 86

  
87

  
88 87
FMAX_1 = Fmax: 
89 88
FMAX_2 = , fmax 
90 89

  
......
247 246
TigerXmlIndexing_7 = SAX: 
248 247

  
249 248
Toolbox_0                         = ** File
250
Toolbox_10                        = ** No worlspace found. Creating a new one.
249
Toolbox_10                        = ** No workspace found. Creating a new one.
251 250
Toolbox_12                        = Loading workspace from file : 
252
Toolbox_14                        = ** Error loadgin workspace from file : 
251
Toolbox_14                        = ** Error loading workspace from file : 
253 252
Toolbox_15                        = ** Error : 
254 253
Toolbox_16                        = \ does not exists
255 254
Toolbox_17                        = End of CQP wait test

Formats disponibles : Unified diff