Revision: 14475
http://gate.svn.sourceforge.net/gate/?rev=14475&view=rev
Author: valyt
Date: 2011-11-01 16:16:51 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Slightly nicer code when dumping query results to a file (for testing).
Fixing the test for the string sequence query.
Modified Paths:
--------------
mimir/trunk/mimir-test/src/gate/mimir/test/QueryTests.java
Modified: mimir/trunk/mimir-test/src/gate/mimir/test/QueryTests.java
===================================================================
--- mimir/trunk/mimir-test/src/gate/mimir/test/QueryTests.java 2011-11-01
15:50:56 UTC (rev 14474)
+++ mimir/trunk/mimir-test/src/gate/mimir/test/QueryTests.java 2011-11-01
16:16:51 UTC (rev 14475)
@@ -304,7 +304,7 @@
// "carbon"};
TermQuery[] termQueries = new TermQuery[terms.length];
for(int j = 0; j < terms.length; j++) {
- termQueries[i] = new TermQuery("string", terms[j]);
+ termQueries[j] = new TermQuery("string", terms[j]);
}
SequenceQuery.Gap[] gaps = new SequenceQuery.Gap[28];
gaps[1] = SequenceQuery.getGap(2, 3);
@@ -470,50 +470,41 @@
private int performQuery(String name, QueryNode query, QueryEngine engine) {
QueryExecutor executor = null;
- Binding hit = null;
- FileWriter queryResult = null;
- BufferedWriter writer = null;
int hitCount = 0;
+ BufferedWriter writer = null;
try {
File resultsDirectory = new File(resultsPath);
- if (!resultsDirectory.exists())
- resultsDirectory.mkdirs();
-
+ if (!resultsDirectory.exists()) resultsDirectory.mkdirs();
executor = query.getQueryExecutor(engine);
+ writer = new BufferedWriter(new FileWriter(resultsPath + "/" + name +
"QueryResult.xml"));
+ writer.write("<query query=\"" + query.toString() + "\">");
+ writer.newLine();
+ writer.write("\t<hits>");
+ writer.newLine();
+
while (executor.nextDocument(-1) != -1) {
- if(hitCount == 0) {
- queryResult = new FileWriter(resultsPath + "/" + name +
"QueryResult.xml");
- writer = new BufferedWriter(queryResult);
- writer.write("<query query=\"" + query.toString() + "\">");
- writer.newLine();
- writer.write("\t<hits>");
- writer.newLine();
+ Binding hit = executor.nextHit();
+ while(hit != null) {
+ hitCount++;
+ writer.write("\t\t<hit number=\"" + hitCount + "\">");
+ writer.write(getHitString(hit, engine));
+ writer.write("</hit>\n");
+ hit = executor.nextHit();
}
- hit = executor.nextHit();
- hitCount++;
- writer.write("\t\t<hit number=\"" + hitCount + "\">");
- writer.write(getHitString(hit, engine));
- writer.write("</hit>\n");
}
- if(hitCount > 0) {
- writer.write("\t</hits>");
- writer.newLine();
- writer.write("</query>");
- writer.newLine();
- writer.flush();
- }
-
+ writer.write("\t</hits>");
+ writer.newLine();
+ writer.write("</query>");
+ writer.newLine();
+ writer.flush();
} catch(Exception e) {
+ e.printStackTrace();
fail(e.getMessage());
} finally {
try {
- if (queryResult != null)
- queryResult.close();
- if (writer != null)
- writer.close();
- if(executor != null)
- executor.close();
+ if (writer != null) writer.close();
+ if(executor != null) executor.close();
} catch(Exception e) {
fail(e.getMessage());
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA® Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
