Révision 2959

tmp/org.txm.libs.msoffice/src/org/txm/libs/msoffice/ReadExcel.java (revision 2959)
708 708
		//
709 709
		// columnsToCopy.put("Notes du titre", "subtitle"); // not working yet
710 710
		// columnsToCopy.put("Titre propre", "title"); // not working yet
711
		// columnsToCopy.put("Date de diffusion", "textorder"); // not working yet
712
		// searchAndReplaceRules.put("textorder", new String[] {"../../....", "$3$2$1"}); // not working yet
711
		// columnsToCopy.put("Date de diffusion", "text-order"); // not working yet
712
		// searchAndReplaceRules.put("text-order", new String[] {"../../....", "$3$2$1"}); // not working yet
713 713

  
714 714
		// sujets
715 715
		table2File = new File("/home/mdecorde/TEMP/ANTRACT/AF/sujets.xlsx");
tmp/org.txm.utils/src/org/txm/utils/AsciiUtils.java (revision 2959)
171 171
		if (s.length() == 0) {
172 172
			return s;
173 173
		}
174
		String rez = s.replaceAll("\\p{Space}++", "_");
174
		String rez = s.trim();
175
		s = s.replaceAll("\\p{Space}++", "_");
175 176
		rez = rez.replaceAll("_", "-");
176 177
		rez = convertNonAscii(rez).toLowerCase();
177 178
		
tmp/org.txm.groovy.core/src/groovy/org/txm/macro/conversion/EuroPressToXML2018Macro.groovy (revision 2959)
318 318
metadataWriter.print columnSeparator+"date"
319 319
metadataWriter.print columnSeparator+"words"
320 320
metadataWriter.print columnSeparator+"pages"
321
metadataWriter.print columnSeparator+"textorder" // date
321
metadataWriter.print columnSeparator+"text-order" // date
322 322
metadataWriter.println ""
323 323
		
324 324
def files = []
tmp/org.txm.groovy.core/src/groovy/org/txm/macro/projects/antract/BuildAFMetadataMacro.groovy (revision 2959)
53 53
	
54 54
	//columnsToCopy.put("Notes du titre", ["subtitle"] as String[]);
55 55
	columnsToCopy.put("Titre propre", ["title"] as String[]); 
56
	columnsToCopy.put("Date de diffusion", ["textorder"] as String[]);
56
	columnsToCopy.put("Date de diffusion", ["text-order"] as String[]);
57 57
	
58
	searchAndReplaceRules.put("textorder", ["([0-9][0-9])/([0-9][0-9])/([0-9][0-9][0-9][0-9])", '$3$2$1'] as String[]); // not working yet
58
	searchAndReplaceRules.put("text-order", ["([0-9][0-9])/([0-9][0-9])/([0-9][0-9][0-9][0-9])", '$3$2$1'] as String[]); // not working yet
59 59
	
60 60
	
61 61
	
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/transcriber/transcriberLoader.groovy (revision 2959)
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 ("textorder".equals(e.getId())) {
125
			if ("text-order".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
			}
......
250 250
	} // end of importer and annotate steps
251 251
	
252 252
	xmltxmFiles = new ArrayList<File>(Arrays.asList(txmDir.listFiles()));
253
	if (metadatas != null && metadatas.getPropertyNames().contains("textorder")) {
253
	if (metadatas != null && metadatas.getPropertyNames().contains("text-order")) {
254 254
		Collections.sort(xmltxmFiles, new Comparator<File>() {
255 255
					public int compare(File f1, File f2) {
256 256
						String o1 = textordersInfo[f1.getName()];
tmp/org.txm.groovy.core/src/groovy/org/txm/scripts/importer/xtz/XTZImport.groovy (revision 2959)
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 ("textorder".equals(e.getId())) {
75
				if ("text-order".equals(e.getId())) {
76 76
					textorder[t] = e.getValue()
77 77
				}
78 78
			}

Formats disponibles : Unified diff