Revision 966 tmp/org.txm.groovy.core/src/groovy/org/txm/macroproto/importer/XTZImporterMacro.groovy

XTZImporterMacro.groovy (revision 966)
210 210
if (srcfiles != null)
211 211
for (int i = 0 ; i < srcfiles.size() ; i++) {// check XML format, and copy file into binDir
212 212
	File f = srcfiles.get(i)
213
	if (f.getName().equals("import.xml") || f.getName().equals("metadata.csv") || f.getName().endsWith(".properties")) {
213
	if (f.getName().equals("import.xml") || f.getName().matches("metadata\.....?") || f.getName().endsWith(".properties")) {
214 214
		srcfiles.remove(i);
215 215
		i--;
216 216
		continue;
......
233 233
println "Trying to read metadatas from: "+allmetadatasfile
234 234
if (MONITOR != null && MONITOR.isCanceled()) { return MONITOR.done(); }
235 235
if (allmetadatasfile.exists()) {
236
	File copy = new File(binDir, "metadata.csv")
236
	File copy = new File(binDir, allmetadatasfile.getName())
237 237
	if (!FileCopy.copy(allmetadatasfile, copy)) {
238 238
		println "Error: could not create a copy of metadata file "+allmetadatasfile.getAbsoluteFile();
239 239
		return;

Also available in: Unified diff