Révision 3641

TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/conversion/EuroPressToXML2018Macro.groovy (revision 3641)
5 5
import java.text.DecimalFormat
6 6
import org.txm.utils.xml.DomUtils
7 7
import org.txm.importer.ValidateXml
8
import groovy.util.XmlParser
8
import groovy.xml.XmlParser
9 9
import org.kohsuke.args4j.*
10 10
import groovy.transform.Field
11 11
import org.txm.rcpapplication.swt.widget.parameters.*
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/prototypes/xml/XSL2CQPMacro.groovy (revision 3641)
6 6
import org.txm.rcpapplication.swt.widget.parameters.*
7 7
import org.txm.searchengine.cqp.corpus.*
8 8
import org.txm.importer.ApplyXsl2;
9
import groovy.util.XmlParser
9
import groovy.xml.XmlParser
10 10

  
11 11
// BEGINNING OF PARAMETERS
12 12

  
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/projects/nov13/PrepareTranscriptionsMacro.groovy (revision 3641)
155 155
	}
156 156
	
157 157
	File tmpFile2 = new File(resultDirectory, "tmp2.xml")
158
	def spks = new groovy.util.XmlSlurper().parse(tmpFile).Speakers.Speaker.collect(){it.attributes()["id"]}
158
	def spks = new groovy.xml.XmlSlurper().parse(tmpFile).Speakers.Speaker.collect(){it.attributes()["id"]}
159 159
	
160 160
	for (def replacement : replacements) {
161 161
	
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/misc/EuroPresse2XMLMacro.groovy (revision 3641)
7 7
import java.text.DecimalFormat
8 8
import org.txm.utils.xml.DomUtils;
9 9
import org.txm.importer.ValidateXml;
10
import groovy.util.XmlParser
10
import groovy.xml.XmlParser
11 11
import org.kohsuke.args4j.*
12 12
import groovy.transform.Field
13 13
import org.txm.rcp.swt.widget.parameters.*
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/AddEventsFromWordMarkersMacro.groovy (revision 3641)
55 55
		else cpb.tick()
56 56
		
57 57
		// Open input file
58
		def slurper = new groovy.util.XmlParser(false, true, true);
58
		def slurper = new groovy.xml.XmlParser(false, true, true);
59 59
		//slurper.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false) // allow DTD declaration
60 60
		//slurper.setProperty("http://javax.xml.XMLConstants/property/accessExternalDTD", "all"); // allow to read DTD from local file
61 61
		def trs = slurper.parse(trsFile.toURI().toString())
......
93 93
		File outfile = new File(resultDirectory, trsFile.getName())
94 94
		outfile.withWriter("UTF-8") { writer ->
95 95
			writer.write('<?xml version="1.0" encoding="UTF-8"?>\n')
96
			def printer = new groovy.util.XmlNodePrinter(new PrintWriter(writer))
96
			def printer = new groovy.xml.XmlNodePrinter(new PrintWriter(writer))
97 97
			printer.setPreserveWhitespace(true)
98 98
			printer.print(trs)
99 99
		}
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/FixTransanaTimings.groovy (revision 3641)
165 165
		
166 166
		trsOutFile.withWriter("UTF-8") { writer ->
167 167
			writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
168
			new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
168
			new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
169 169
		
170 170
		return true;
171 171
	}
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/SetTRSTurnTimingsAndSpeakers.groovy (revision 3641)
35 35
	}
36 36

  
37 37
	public boolean process() {
38
		def slurper = new groovy.util.XmlParser();
38
		def slurper = new groovy.xml.XmlParser();
39 39
		def trs = slurper.parse(trsInFile)
40 40

  
41 41
		// collect speakers from Turn@speaker values
......
165 165
		
166 166
		trsOutFile.withWriter("UTF-8") { writer ->
167 167
			writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
168
			new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
168
			new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
169 169
		
170 170
		return true;
171 171
	}
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/TrimTranscriptionMacro.groovy (revision 3641)
23 23

  
24 24
import java.text.SimpleDateFormat;
25 25
import java.util.Date;
26
import groovy.util.XmlParser
26
import groovy.xml.XmlParser
27 27

  
28 28
@Field @Option(name="trsFile", usage="Input TRS file", widget="FileOpen", required=true, def="")
29 29
		File trsFile;
......
123 123

  
124 124
outputTrsFile.withWriter("UTF-8") { writer ->
125 125
	writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
126
	new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
126
	new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
127 127

  
128 128
return true;
129 129

  
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/AddSectionsFromTableMacro.groovy (revision 3641)
255 255
		sections = sections.sort() { a, b -> a[0] <=> b[0] ?: a[1] <=> -b[1] } // negative second test for sections inclusion
256 256
		
257 257
		// Open input file
258
		slurper = new groovy.util.XmlParser(false, true, true);
258
		slurper = new groovy.xml.XmlParser(false, true, true);
259 259
		slurper.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false) // allow DTD declaration
260 260
		slurper.setProperty("http://javax.xml.XMLConstants/property/accessExternalDTD", "all"); // allow to read DTD from local file
261 261
		trs = slurper.parse(trsFile.toURI().toString())
......
501 501
		File outfile = new File(outputDirectory, trsFile.getName())
502 502
		outfile.withWriter("UTF-8") { writer ->
503 503
			writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
504
			def printer = new groovy.util.XmlNodePrinter(new PrintWriter(writer))
504
			def printer = new groovy.xml.XmlNodePrinter(new PrintWriter(writer))
505 505
			printer.setPreserveWhitespace(true)
506 506
			printer.print(trs)
507 507
		}
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/transcription/SegmentTRSInSectionFromMarkerMacro.groovy (revision 3641)
64 64
		else cpb.tick()
65 65
		
66 66
		// Open input file
67
		def slurper = new groovy.util.XmlParser(false, true, true);
67
		def slurper = new groovy.xml.XmlParser(false, true, true);
68 68
		slurper.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false) // allow DTD declaration
69 69
		slurper.setProperty("http://javax.xml.XMLConstants/property/accessExternalDTD", "all"); // allow to read DTD from local file
70 70
		def trs = slurper.parse(trsFile.toURI().toString())
......
166 166
		File outfile = new File(resultDirectory, trsFile.getName())
167 167
		outfile.withWriter("UTF-8") { writer ->
168 168
			writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
169
			def printer = new groovy.util.XmlNodePrinter(new PrintWriter(writer))
169
			def printer = new groovy.xml.XmlNodePrinter(new PrintWriter(writer))
170 170
			printer.setPreserveWhitespace(true)
171 171
			printer.print(trs)
172 172
		}
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/xml/StructurePropertiesInjectionMacro.groovy (revision 3641)
81 81
	
82 82
	if (debug) println "text $xmlFile"
83 83
	
84
	def parser = new groovy.util.XmlParser()
84
	def parser = new groovy.xml.XmlParser()
85 85
	parser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false)
86 86
	parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
87 87
	def doc = parser.parse(xmlFile)
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/xml/ValidateMacro.groovy (revision 3641)
15 15
import org.txm.importer.ApplyXsl2
16 16

  
17 17
import net.sf.saxon.TransformerFactoryImpl
18
import org.txm.utils.saxon.SaxonNodeSet
18
//import org.txm.utils.saxon.SaxonNodeSet
19 19
import javax.xml.transform.stream.StreamSource
20 20
import javax.xml.transform.stream.StreamResult
21 21

  
......
89 89
System.setProperty("javax.xml.transform.TransformerFactory", "net.sf.saxon.TransformerFactoryImpl")
90 90
tFactory = new net.sf.saxon.TransformerFactoryImpl()
91 91
tConfiguration = tFactory.getConfiguration()
92
tConfiguration.registerExtensionFunction(new SaxonNodeSet()) // ?
92
//tConfiguration.registerExtensionFunction(new SaxonNodeSet()) // no more needed ?
93 93
// the following features don't seem to work, yet
94 94
tConfiguration.setConfigurationProperty(net.sf.saxon.lib.FeatureKeys.LINE_NUMBERING, true)
95 95
tConfiguration.setConfigurationProperty(net.sf.saxon.lib.FeatureKeys.RECOVERY_POLICY, net.sf.saxon.Configuration.RECOVER_WITH_WARNINGS)
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/xml/ InjectPropertiesIntoStructureMacro.groovy (revision 3641)
74 74
	
75 75
	if (debug) println "text $xmlFile"
76 76
	
77
	def parser = new groovy.util.XmlParser()
77
	def parser = new groovy.xml.XmlParser()
78 78
	parser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false)
79 79
	parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
80 80
	def doc = parser.parse(xmlFile)
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/xml/XMLStatisticsMacro.groovy (revision 3641)
6 6
import org.txm.rcp.swt.widget.parameters.*
7 7

  
8 8
@Field @Option(name="inputDirectory", usage="Dossier qui contient les fichiers à parser", widget="Folder", required=true, def="src")
9
File inputDirectory;
9
def inputDirectory;
10 10

  
11 11
@Field @Option(name="xmlFilesExtension", usage="Extension des fichiers XML à traiter", widget="String", required=true, def=".xml")
12
File xmlFilesExtension;
12
def xmlFilesExtension;
13 13

  
14 14
@Field @Option(name="csvFile", usage="FichierTSV résultat", widget="File", required=true, def="file.tsv")
15
File csvFile;
15
def csvFile;
16 16

  
17 17
@Field @Option(name="usePaths", usage="FichierTSV résultat", widget="Boolean", required=true, def="false")
18 18
def usePaths = true
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/CropTranscription.groovy (revision 3641)
62 62
	println ""+xml
63 63
	outfile.withWriter("UTF-8"){ writer ->
64 64
		writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
65
		new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
65
		new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
66 66
}
67 67

  
68 68
/// MAIN ///
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/FixTiming.groovy (revision 3641)
220 220
	println ""+xml
221 221
	outfile.withWriter("UTF-8"){ writer ->
222 222
		writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
223
		new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
223
		new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
224 224
}
225 225

  
226 226
/// MAIN ///
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/ShiftTimings.groovy (revision 3641)
89 89
	println ""+xml
90 90
	outfile.withWriter("UTF-8"){ writer ->
91 91
		writer.write('<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE Trans SYSTEM "trans-14.dtd">\n')
92
		new groovy.util.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
92
		new groovy.xml.XmlNodePrinter(new PrintWriter(writer)).print(trs) }
93 93
}
94 94

  
95 95
/// MAIN ///
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/txt/compiler.groovy (revision 3641)
196 196
		corpus.setDescription("Built with the TXT+CSV import module");
197 197
		
198 198
		File cqpFile = new File(binDir,"cqp/"+corpusname+".cqp");
199
cqpFile.delete()
199
		cqpFile.delete()
200 200
		new File(binDir,"cqp").mkdirs()
201 201
		new File(binDir,"data").mkdirs()
202 202
		new File(binDir,"registry").mkdirs()
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/lasla/compiler.groovy (revision 3641)
36 36
import org.txm.importer.cwb.CwbMakeAll
37 37
import org.txm.scripts.importer.*;
38 38
import org.txm.scripts.*;
39
import org.txm.importer.scripts.xmltxm.BuildTTSrc;
40 39
import org.txm.importer.scripts.xmltxm.*;
41 40
import org.txm.utils.treetagger.TreeTagger;
42 41

  
......
210 209
			}
211 210
			else
212 211
			{	
213
				cqpbuilder = new XMLTXM2CQP(f.toURL());
212
				cqpbuilder = new XMLTXM2CQP(f.toURL(), cqpbuilder);
214 213
				String txtname = f.getName().substring(0,f.getName().length()-4);
215 214
				cqpbuilder.setTextInfo(txtname, basename, "project");
216 215

  
TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/doc/FixBreaksAndAutomaticStyles.groovy (revision 3641)
6 6

  
7 7
import groovy.xml.QName
8 8
import groovy.xml.StreamingMarkupBuilder
9
import groovy.util.XmlParser
9
import groovy.xml.XmlParser
10 10

  
11 11
class FixBreaksAndAutomaticStyles {
12 12

  

Formats disponibles : Unified diff