You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by do...@apache.org on 2011/02/06 18:18:54 UTC
svn commit: r1067705 - in /lucene/dev/trunk: ./ lucene/
modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/trecdocs.zip
Author: doronc
Date: Sun Feb 6 17:18:53 2011
New Revision: 1067705
URL: http://svn.apache.org/viewvc?rev=1067705&view=rev
Log:
LUCENE-1540: Improvements to contrib.benchmark for TREC collections - fix test failures in some locales due to toUpperCase() - port/merged from 3x.
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/trecdocs.zip
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java?rev=1067705&r1=1067704&r2=1067705&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java Sun Feb 6 17:18:53 2011
@@ -29,7 +29,12 @@ import java.util.Map;
public abstract class TrecDocParser {
/** Types of trec parse paths, */
- public enum ParsePathType { GOV2, FBIS, FT, FR94, LATIMES }
+ public enum ParsePathType { GOV2("gov2"), FBIS("fbis"), FT("ft"), FR94("fr94"), LATIMES("latimes");
+ public final String dirName;
+ private ParsePathType(String dirName) {
+ this.dirName = dirName;
+ }
+ }
/** trec parser type used for unknown extensions */
public static final ParsePathType DEFAULT_PATH_TYPE = ParsePathType.GOV2;
@@ -46,7 +51,7 @@ public abstract class TrecDocParser {
static final Map<String,ParsePathType> pathName2Type = new HashMap<String,ParsePathType>();
static {
for (ParsePathType ppt : ParsePathType.values()) {
- pathName2Type.put(ppt.name(),ppt);
+ pathName2Type.put(ppt.dirName,ppt);
}
}
@@ -59,7 +64,7 @@ public abstract class TrecDocParser {
public static ParsePathType pathType(File f) {
int pathLength = 0;
while (f != null && ++pathLength < MAX_PATH_LENGTH) {
- ParsePathType ppt = pathName2Type.get(f.getName().toUpperCase());
+ ParsePathType ppt = pathName2Type.get(f.getName());
if (ppt!=null) {
return ppt;
}
Modified: lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/trecdocs.zip
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/trecdocs.zip?rev=1067705&r1=1067704&r2=1067705&view=diff
==============================================================================
Binary files - no diff available.