Révision 1193

tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZPager.groovy (revision 1193)
116 116

  
117 117
				for (i = 0 ; i < ed.getPageFiles().size();) {
118 118
					File f = ed.getPageFiles().get(i);
119
					String wordid = ed.getIdx().get(i);
119
					String wordid = "w_0";
120
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
120 121
					edition.addPage(""+(++i), wordid);
121 122
				}
122 123
			} catch(Exception e) {
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xmltxm/xmltxmLoader.groovy (revision 1193)
221 221
			edition.setIndex(outdir.getAbsolutePath());
222 222
		for (i = 0 ; i < ed.getPageFiles().size();) {
223 223
			File f = ed.getPageFiles().get(i);
224
			String wordid = ed.getIdx().get(i);
224
			String wordid = "w_0";
225
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
225 226
			edition.addPage(""+(++i), wordid);
226 227
		}
227 228
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/frantext/frantextLoader.groovy (revision 1193)
203 203

  
204 204
		for (i = 0 ; i < ed.getPageFiles().size();) {
205 205
			File f = ed.getPageFiles().get(i);
206
			String wordid = ed.getIdx().get(i);
206
			String wordid = "w_0";
207
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
207 208
			params.addPage(edition, ""+(++i), wordid);
208 209
		}
209 210
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/discours/discoursLoader.groovy (revision 1193)
131 131
		edition.setIndex(outdir.getAbsolutePath());
132 132
		for (i = 0 ; i < ed.getPageFiles().size();) {
133 133
			File f = ed.getPageFiles().get(i);
134
			String wordid = ed.getIdx().get(i);
134
			String wordid = "w_0";
135
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
135 136
			edition.addPage(""+(++i), wordid);
136 137
		}
137 138
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xml/xmlLoader.groovy (revision 1193)
279 279

  
280 280
		for (i = 0 ; i < ed.getPageFiles().size();) {
281 281
			File f = ed.getPageFiles().get(i);
282
			String wordid = ed.getIdx().get(i);
282
			String wordid = "w_0";
283
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
283 284
			edition.addPage(""+(++i), wordid);
284 285
		}
285 286
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/bfm/bfmLoader.groovy (revision 1193)
186 186
		edition.setIndex(outdir.getAbsolutePath());
187 187
		for (i = 0 ; i < ed.getPageFiles().size();) {
188 188
			File f = ed.getPageFiles().get(i);
189
			String wordid = ed.getIdx().get(i);
189
			String wordid = "w_0";
190
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
190 191
			edition.addPage(""+(++i), wordid);
191 192
		}
192 193
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/doc/docLoader.groovy (revision 1193)
315 315
		edition.setIndex(outdir.getAbsolutePath());
316 316
		for (i = 0 ; i < ed.getPageFiles().size();) {
317 317
			File f = ed.getPageFiles().get(i);
318
			String wordid = ed.getIdx().get(i);
318
			String wordid = "w_0";
319
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
319 320
			edition.addPage(""+(++i), wordid);
320 321
		}
321 322
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/tmx/tmxLoader.groovy (revision 1193)
162 162
			edition.setIndex(outdir.getAbsolutePath());
163 163
			for (i = 0 ; i < ed.getPageFiles().size();) {
164 164
				File f = ed.getPageFiles().get(i);
165
				String wordid = ed.getIdx().get(i);
165
				String wordid = "w_0";
166
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
166 167
				edition.addPage(""+(++i), wordid);
167 168
			}
168 169
		}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/factiva/factivaLoader.groovy (revision 1193)
271 271

  
272 272
		for (i = 0 ; i < ed.getPageFiles().size();) {
273 273
			File f = ed.getPageFiles().get(i);
274
			String wordid = ed.getIdx().get(i);
274
			String wordid = "w_0";
275
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
275 276
			edition.addPage(""+(++i), wordid);
276 277
		}
277 278
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/factiva/factivamailLoader.groovy (revision 1193)
142 142
		edition.setIndex(outdir.getAbsolutePath());
143 143
	for (i = 0 ; i < ed.getPageFiles().size();) {
144 144
		File f = ed.getPageFiles().get(i);
145
		String wordid = ed.getIdx().get(i);
145
		String wordid = "w_0";
146
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
146 147
		edition.addPage(""+(++i), wordid);
147 148
	}
148 149
}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/transcriberLoader.groovy (revision 1193)
279 279
			edition.setIndex(htmlDir.getAbsolutePath());
280 280
			for (i = 0 ; i < ed.getPageFiles().size();) {
281 281
				File f = ed.getPageFiles().get(i);
282
				String wordid = ed.getIdx().get(i);
282
				String wordid = "w_0";
283
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
283 284
				edition.addPage(""+(++i), wordid);
284 285
			}
285 286
		}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/txt/txtLoader.groovy (revision 1193)
186 186
		edition.setIndex(outdir.getAbsolutePath());
187 187
		for (i = 0 ; i < ed.getPageFiles().size();) {
188 188
			File f = ed.getPageFiles().get(i);
189
			String wordid = ed.getIdx().get(i);
189
			String wordid = "w_0";
190
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
190 191
			edition.addPage(""+(++i), wordid);
191 192
		}
192 193
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/alceste/alcesteLoader.groovy (revision 1193)
144 144
		edition.setIndex(outdir.getAbsolutePath());
145 145
		for (i = 0 ; i < ed.getPageFiles().size();) {
146 146
			File f = ed.getPageFiles().get(i);
147
			String wordid = ed.getIdx().get(i);
147
			String wordid = "w_0";
148
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
148 149
			edition.addPage(""+(++i), wordid);
149 150
		}
150 151
	}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/hyperbase/hyperbaseLoader.groovy (revision 1193)
144 144

  
145 145
		for (i = 0 ; i < ed.getPageFiles().size();) {
146 146
			File f = ed.getPageFiles().get(i);
147
			String wordid = ed.getIdx().get(i);
147
			String wordid = "w_0";
148
				if (i < ed.getIdx().size()) wordid = ed.getIdx().get(i);
148 149
			edition.addPage(""+(++i), wordid);
149 150
		}
150 151
	}
tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/UpdateCorpus.java (revision 1193)
36 36
	public static JobHandler update(final MainCorpus corpus) {
37 37
		
38 38
		Project project = corpus.getProject();
39
		if (project == null)  return null;
40
		
39 41
		if (!"xtz".equals(project.getImportModuleName())) {
40
			System.out.println("Can't update a corpus not imprted with XTZ import module.");
42
			System.out.println("Can't update a corpus not imported with the XTZ import module.");
41 43
			return null;
42 44
		}
43 45
		project.setDirty();
tmp/org.txm.core/src/java/org/txm/objects/Project.java (revision 1193)
325 325
		else	{
326 326
			return true;
327 327
		}
328
		
329
		
330 328
	}
331 329
	
332 330
	/**
tmp/org.txm.core/build.properties (revision 1193)
30 30
               lib/unoil-3.2.1.jar,\
31 31
               src/groovy/,\
32 32
               plugin.xml,\
33
               lib/hsqldb.jar,\
34 33
               lib/sqlite-jdbc-3.8.11.2.jar,\
35 34
               lib/postgresql-9.4.1207.jre6.jar,\
36 35
               lib/jodconverter-core-3.1-beta.jar,\
tmp/org.txm.core/META-INF/MANIFEST.MF (revision 1193)
9 9
 org.eclipse.core.commands;visibility:=reexport,
10 10
 org.eclipse.core.resources;visibility:=reexport,
11 11
 org.txm.libs.office;bundle-version="0.0.0";visibility:=reexport,
12
 org.txm.libs.msoffice;bundle-version="0.0.0";visibility:=reexport
12
 org.txm.libs.msoffice;bundle-version="0.0.0";visibility:=reexport,
13
 org.txm.libs.hsqldb;bundle-version="1.0.0";visibility:=reexport
13 14
Export-Package: .,
14 15
 EDU.oswego.cs.dl.util.concurrent,
15 16
 EDU.oswego.cs.dl.util.concurrent.misc,
......
278 279
 org.hamcrest,
279 280
 org.hamcrest.core,
280 281
 org.hamcrest.internal,
281
 org.hsqldb,
282
 org.hsqldb.auth,
283
 org.hsqldb.dbinfo,
284
 org.hsqldb.error,
285
 org.hsqldb.index,
286
 org.hsqldb.jdbc,
287
 org.hsqldb.jdbc.pool,
288
 org.hsqldb.lib,
289
 org.hsqldb.lib.java,
290
 org.hsqldb.lib.tar,
291
 org.hsqldb.lib.tar.rb,
292
 org.hsqldb.map,
293
 org.hsqldb.navigator,
294
 org.hsqldb.persist,
295
 org.hsqldb.resources,
296
 org.hsqldb.result,
297
 org.hsqldb.rights,
298
 org.hsqldb.rowio,
299
 org.hsqldb.sample,
300
 org.hsqldb.scriptio,
301
 org.hsqldb.server,
302
 org.hsqldb.types,
303
 org.hsqldb.util,
304 282
 org.jdesktop.layout,
305 283
 org.json,
306 284
 org.jsoup,
......
471 449
 target
472 450
Bundle-Vendor: Textometrie.org
473 451
Bundle-ActivationPolicy: lazy
474
Bundle-ClassPath: .,lib/ant-1.7.1.jar,lib/ant-launcher.jar,lib/ant.jar
475
 ,lib/antlr-2.7.7.jar,lib/asm-analysis-2.2.3.jar,lib/asm-tree-2.2.3.ja
476
 r,lib/colt-1.2.0.jar,lib/concurrent-1.3.4.jar,lib/dom4j-1.6.1.jar,lib
477
 /forms-1.0.7.jar,lib/jline-0.9.94.jar,lib/junit-4.5.jar,lib/jvectClip
478
 board-1.2.jar,lib/liquidlnf.jar,lib/log4j-1.2.12.jar,lib/looks-2.0.1.
479
 jar,lib/macSpecific.jar,lib/quaqua.jar,lib/REngine.jar,lib/RserveEngi
480
 ne.jar,lib/rtfCleaner.jar,lib/swing-layout-1.0.3.jar,lib/juniversalch
481
 ardet-1.0.3.jar,lib/textcat-1.0.1.jar,lib/saxon9he.jar,lib/jtidy-r938
482
 .jar,lib/json-20090211.jar,lib/juh-3.2.1.jar,lib/jurt-3.2.1.jar,lib/r
483
 idl-3.2.1.jar,lib/unoil-3.2.1.jar,lib/hsqldb.jar,lib/sqlite-jdbc-3.8.
484
 11.2.jar,lib/postgresql-9.4.1207.jre6.jar,lib/jodconverter-core-3.1-b
485
 eta.jar
452
Bundle-ClassPath: .,
453
 lib/ant-1.7.1.jar,
454
 lib/ant-launcher.jar,
455
 lib/ant.jar,
456
 lib/antlr-2.7.7.jar,
457
 lib/asm-analysis-2.2.3.jar,
458
 lib/asm-tree-2.2.3.jar,
459
 lib/colt-1.2.0.jar,
460
 lib/concurrent-1.3.4.jar,
461
 lib/dom4j-1.6.1.jar,
462
 lib/forms-1.0.7.jar,
463
 lib/jline-0.9.94.jar,
464
 lib/junit-4.5.jar,
465
 lib/jvectClipboard-1.2.jar,
466
 lib/liquidlnf.jar,
467
 lib/log4j-1.2.12.jar,
468
 lib/looks-2.0.1.jar,
469
 lib/macSpecific.jar,
470
 lib/quaqua.jar,
471
 lib/REngine.jar,
472
 lib/RserveEngine.jar,
473
 lib/rtfCleaner.jar,
474
 lib/swing-layout-1.0.3.jar,
475
 lib/juniversalchardet-1.0.3.jar,
476
 lib/textcat-1.0.1.jar,
477
 lib/saxon9he.jar,
478
 lib/jtidy-r938.jar,
479
 lib/json-20090211.jar,
480
 lib/juh-3.2.1.jar,
481
 lib/jurt-3.2.1.jar,
482
 lib/ridl-3.2.1.jar,
483
 lib/unoil-3.2.1.jar,
484
 lib/sqlite-jdbc-3.8.11.2.jar,
485
 lib/postgresql-9.4.1207.jre6.jar,
486
 lib/jodconverter-core-3.1-beta.jar
486 487
Bundle-Version: 0.8.0.qualifier
487 488
Bundle-Name: TXM Core Toolbox
488 489
Bundle-ManifestVersion: 2
tmp/org.txm.core/.classpath (revision 1193)
39 39
	<classpathentry kind="src" path="test"/>
40 40
	<classpathentry kind="src" path="res"/>
41 41
	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
42
	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
43 42
	<classpathentry exported="true" kind="lib" path="lib/jodconverter-core-3.1-beta.jar"/>
44 43
	<classpathentry kind="lib" path="lib/jsoup-1.11.3.jar"/>
45 44
	<classpathentry kind="output" path="bin"/>
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationExtension.java (revision 1193)
5 5
import java.util.Comparator;
6 6

  
7 7
import org.eclipse.core.runtime.IConfigurationElement;
8
import org.eclipse.core.runtime.IProgressMonitor;
9
import org.eclipse.core.runtime.IStatus;
8 10
import org.eclipse.core.runtime.Platform;
11
import org.eclipse.core.runtime.Status;
9 12
import org.eclipse.swt.SWT;
10 13
import org.eclipse.swt.events.SelectionEvent;
11 14
import org.eclipse.swt.events.SelectionListener;
......
14 17
import org.eclipse.swt.widgets.ToolItem;
15 18
import org.txm.core.results.TXMResult;
16 19
import org.txm.rcp.IImageKeys;
20
import org.txm.rcp.commands.workspace.UpdateCorpus;
17 21
import org.txm.rcp.editors.TXMEditorExtension;
22
import org.txm.rcp.utils.JobHandler;
23
import org.txm.rcp.views.corpora.CorporaView;
24
import org.txm.searchengine.cqp.corpus.MainCorpus;
18 25
import org.txm.utils.logger.Log;
19 26

  
20 27
public class AnnotationExtension extends TXMEditorExtension<TXMResult> {
......
26 33
	private SelectionListener defaultListener;
27 34

  
28 35
	private ToolItem saveButton;
29
	
36

  
30 37
	public static final String GROUP_NAME = "Annotation";
31 38

  
32 39
	@Override
......
130 137
						saveSuccessful = saveSuccessful && aa.save();
131 138
					}
132 139
				}
133
				saveButton.setEnabled(!saveSuccessful);
140

  
141
				JobHandler job = new JobHandler("Updating corpus editions and indexes", true) {
142

  
143
					@Override
144
					protected IStatus run(IProgressMonitor monitor) {
145
						final MainCorpus corpus = (MainCorpus) editor.getResult().getFirstParent(MainCorpus.class);
146
						monitor.setTaskName("updating corpus indexes and editions");
147
						if (corpus != null && UpdateCorpus.update(corpus) != null) {
148
							monitor.worked(50);
149
							this.syncExec(new Runnable() {
150
								public void run() {
151
									CorporaView.refreshObject(corpus);
152
								}
153
							});
154
							return Status.OK_STATUS;
155
						} else {
156
							monitor.worked(50);
157
							System.out.println("Fail to update corpus. Aborting");
158
							System.out.println("Fix XML-TXM files and call command 'UpdateCorpus'");
159
							return Status.CANCEL_STATUS;
160
						}
161
					}
162
				};
163
				job.schedule();
164

  
165

  
134 166
			}
135 167

  
136 168
			@Override
......
173 205
			editor.getTopToolbar().setVisible(GROUP_NAME, false);
174 206
		}
175 207
	}
176
	
208

  
177 209
	protected void openDefaultAnnotationMode(SelectionEvent e) {
178 210
		defaultListener.widgetSelected(e);
179 211
	}
tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/editor/AnnotationArea.java (revision 1193)
59 59
	protected abstract void _close();
60 60

  
61 61
	/**
62
	 * use this to save the annotations
62
	 * use this to save the annotations. Save must end when the files are updated
63 63
	 * 
64 64
	 * @return
65 65
	 */
tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java (revision 1193)
81 81
//		
82 82
		//properties.put(PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML, "/home/mdecorde/workspace079/org.txm.annotation.core/META-INF");
83 83
//		//properties.put("javax.persistence.jdbc.driver", "org.hsqldb.jdbcDriver");
84
//		String urlProperty = "jdbc:hsqldb:file:"+dbPath+"/db;shutdown=true;hsqldb.lock_file=false;";
85
//		if (Log.getLevel().intValue() < Level.WARNING.intValue()) {
86
//			urlProperty += "";
87
//		} else {
88
//			urlProperty += "hsqldb.applog=0;hsqldb.sqllog=0";
89
//		}
90
//		properties.put("javax.persistence.jdbc.url", urlProperty);
84
		String urlProperty = "jdbc:hsqldb:file:"+dbPath+"/db;shutdown=true;hsqldb.lock_file=false;";
85
		if (Log.getLevel().intValue() < Level.WARNING.intValue()) {
86
			urlProperty += "";
87
		} else {
88
			urlProperty += "hsqldb.applog=0;hsqldb.sqllog=0";
89
		}
90
		properties.put("javax.persistence.jdbc.url", urlProperty);
91 91
//		properties.put("javax.persistence.jdbc.username", "SA");
92 92
//		properties.put(PersistenceUnitProperties.DDL_GENERATION_MODE, "database");
93 93
//		properties.put(PersistenceUnitProperties.DDL_GENERATION, "create-or-extend-tables"); // create&update table if needed
tmp/org.txm.rcp.feature/feature.xml (revision 1193)
437 437
         version="0.0.0"
438 438
         unpack="false"/>
439 439

  
440
   <plugin
441
         id="org.txm.libs.hsqldb"
442
         download-size="0"
443
         install-size="0"
444
         version="0.0.0"
445
         unpack="false"/>
446

  
440 447
</feature>
tmp/org.txm.setups/shared/win/txm.nsi (revision 1193)
227 227
	
228 228
	SetOutPath $INSTDIR
229 229
	
230
	File /r ..\..\exportRCP\win32.win32.x86_64\*.*
230
	File /r ..\..\exportRCP\win32.win32.x86_64\TXM\*.*
231 231
	
232 232
	;File /r plugins
233 233
	;File /r features
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/SaveAnnotations.java (revision 1193)
81 81

  
82 82
					if (rez) {
83 83
						System.out.println("Annotations are saved in XML-TXM files. Updating corpus indexes and editions");
84

  
85
						monitor.setTaskName("updating corpus indexes and editions");
86
						if (UpdateCorpus.update(corpus) != null) {
87
							monitor.worked(50);
88
							this.syncExec(new Runnable() {
89
								public void run() {CorporaView.refreshObject(corpus);}
90
							});
91
						} else {
92
							monitor.worked(50);
93
							System.out.println("Fail to update corpus. Aborting");
94
							System.out.println("Fix XML-TXM files and call command 'UpdateCorpus'");
95
						}
96 84
					} else {
97 85
						System.out.println("Error while saving annotations (see logs above).");
98 86
					}
......
107 95
		};
108 96

  
109 97
		if (doit[0]) jobhandler.startJob(true);
110

  
98
		jobhandler.join();
111 99
		return jobhandler;
112 100
	}
113 101
}
tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java (revision 1193)
537 537
					if (am != null && am.hasChanges()) {
538 538
						// && MessageDialog.openConfirm(e.display.getActiveShell(), "Confirm annotation save", "Saving annotation will close this editor. Are you sure you want to save annotations right now ?")
539 539
						JobHandler saveJob = SaveAnnotations.save(corpus.getMainCorpus());
540
						
540 541
						if (saveJob.getResult() == Status.CANCEL_STATUS) {
541 542
							// update editor corpus
542 543
							System.out.println("Fail to save annotations of the corpus."); //$NON-NLS-1$

Formats disponibles : Unified diff