Révision 3183

tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/transcriberLoader.groovy (revision 3183)
122 122
	for (String t : metadatas.keySet()) {
123 123
		def ti = metadatas.get(t)
124 124
		for (org.txm.metadatas.Entry e : ti) {
125
			if ("text-order".equals(e.getId())) {
125
			if ("text-order".equals(e.getId()) || "textorder".equals(e.getId())) {
126 126
				String k = ""+t+".xml" // the sort test will use the xml-txm file names
127 127
				textordersInfo[k] = e.value
128 128
			}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImport.groovy (revision 3183)
72 72
		for (String t : metadata.keySet()) {
73 73
			def ti = metadata.get(t)
74 74
			for (org.txm.metadatas.Entry e : ti) {
75
				if ("text-order".equals(e.getId())) {
75
				if ("text-order".equals(e.getId()) || "textorder".equals(e.getId())) {
76 76
					textorder[t] = e.getValue()
77 77
				}
78 78
			}
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZDefaultPagerStep.groovy (revision 3183)
148 148
	
149 149
	private def closeMultiWriter() {
150 150
		if (pagedWriter != null) {
151
			def tags = pagedWriter.getTagStack()
151
			def tags = []
152
			tags.addAll(pagedWriter.getTagStack())
152 153
			
153
			//			println "STACK="+pagedWriter.getTagStack()
154
			//			def stack = Thread.currentThread().getStackTrace();
155
			//			int m = Math.min(15, stack.size()-1)
156
			//			for (def s : stack[1..m]) println s
157
			//			println "FILE ="+outfile
154
			//println "CLOSING... STACK="+pagedWriter.getTagStack()
155
			// def stack = Thread.currentThread().getStackTrace();
156
			// int m = Math.min(15, stack.size()-1)
157
			// for (def s : stack[1..m]) println s
158
			// println "FILE ="+outfile
158 159
			if (firstWord) { // there was no words
159 160
				pagedWriter.writeCharacters("");
160 161
				this.idxstart.add("w_0")
......
183 184
			
184 185
			pagedWriter.close();
185 186
			
186
			//			println "STACK TO REWRITE: $tags"
187
			//println "STACK TO REWRITE: $tags"
187 188
			int removedDiv = 0;
188 189
			for (int i = 0 ; i < tags.size() ; i++) {
189 190
				def tag = tags.remove(0)
......
194 195
					if (removedDiv == 2) break; // remove elements until first "div" tag
195 196
				}
196 197
			}
197
			//			println "STACK TO REWRITE2: $tags"
198
			// println "STACK TO REWRITE2: $tags"
198 199
			return tags;
199 200
		} else {
200 201
			return [];
......
238 239
			pagedWriter.writeStartElement("div", ["class": pager.getImportModule().getProject().getName()]) //<div> of the corpus
239 240
			pagedWriter.writeStartElement("div", ["class": "txmeditionpage"]) //<div>
240 241
			
242
			println "NEW HTML: "+outfile
243
			println "TAGS: "+tags
241 244
			pagedWriter.writeStartElements(tags)
242 245
			return true;
243 246
		} catch (Exception e) {
......
417 420
							//case "l":
418 421
								pagedWriter.writeEmptyElement("br", ["class":rend])
419 422
								break;
423
							case "ab":
424
							case "body":
420 425
							case "div":
421 426
							case "div1":
422 427
							case "div2":
......
518 523
						break;
519 524
					case XMLStreamConstants.END_ELEMENT:
520 525
						localname = parser.getLocalName();
526
						
521 527
						if (currentOutOfTextElements.size() > 0) currentOutOfTextElements.pop()
528
						
522 529
						writeOutOfTextToEditText = currentOutOfTextElements.size() > 0
523 530
					
524 531
						if (localname == paginationElement) {
......
541 548
								break;
542 549
							case "lb":
543 550
								break;
551
							
552
							case "ab":
553
							case "body":
544 554
							case "div":
545 555
							case "div1":
546 556
							case "div2":

Formats disponibles : Unified diff