Révision 2117

tmp/org.txm.tigersearch.rcp/groovy/org/txm/scripts/importer/tigersearch/TSImport.groovy (revision 2117)
87 87
			catch (Exception e) { System.out.println(e.getMessage()); }
88 88
		}
89 89
	}
90
	
91
	ArrayList<File> orderedFiles= null;
92
	protected ArrayList<File> getTXMFilesOrder() {
93
		orderedFiles;
94
	}
90 95
}
tmp/org.txm.tigersearch.rcp/groovy/org/txm/scripts/importer/tigersearch/TSImporter.groovy (revision 2117)
47 47
		File master = new File(sourceDirectory, "main.xml")
48 48
		
49 49
		def xmlFiles = [] // the TIGER XML files
50
		
51 50
		if (!master.exists() ) {
51
			master = new File(sourceDirectory, "master.xml")
52
		}
53
		if (!master.exists() ) {
52 54
//			master = new File(sourceDirectory, "main.xml")
53 55
//			String subcorpora = "";
54 56
			xmlFiles = sourceDirectory.listFiles(new FileFilter() {
......
89 91
				return;
90 92
			}
91 93
		}
92

  
94
		
93 95
		// get the last version of the TIGER XML -> XML-TXM XSL
94 96
		File tsXSLFile = new File(Toolbox.getTxmHomePath(), "xsl/ts.xsl");
95 97
		BundleUtils.copyFiles("org.txm.tigersearch.rcp", "groovy", "org/txm/scripts/importer/tigersearch", "ts.xsl", tsXSLFile.getParentFile());
......
120 122
		if (!doToXMLTXMStep()) return;
121 123
		if (!doInjectMetadataStep()) return;
122 124

  
123
		File txmdDir = new File(module.getBinaryDirectory(),"txm");
124
		isSuccessFul = txmdDir.listFiles(IOUtils.HIDDENFILE_FILTER).size() > 0
125
		module.orderedFiles = new ArrayList<File>();
126
		for (def f : xmlFiles) module.orderedFiles.add(new File(outputDirectory, f.getName()))
127
		
128
		isSuccessFul = outputDirectory.listFiles(IOUtils.HIDDENFILE_FILTER).size() > 0
125 129
	}
126 130
}
tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TIGERSearchEngine.java (revision 2117)
59 59

  
60 60
		
61 61
		TSCorpus tcorpus = manager.getCorpus(corpus.getRootCorpusBuild().getID());
62
		TSResult result = tcorpus.query(query.getQueryString());
62
		TSResult result = tcorpus.query(query.getQueryString().replace("\n", " "));
63 63
		MatchResult mresult = result.getMatchResult();
64 64
		int size = mresult.size();
65 65
		//System.out.println("size: "+size);

Formats disponibles : Unified diff