lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1457391 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/benchmark/ lucene/benchmark/conf/english-porter-comparison.alg lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
Date Sun, 17 Mar 2013 07:34:02 GMT
Author: sarowe
Date: Sun Mar 17 07:34:02 2013
New Revision: 1457391

URL: http://svn.apache.org/r1457391
Log:
Fix AnalyzerFactoryTask to call ResourceLoaderAware.inform using the current directory if
neither the 'work.dir' property value nor ./work/ are legit directories; also fix the english-porter-comparison.alg
report task to be RepSumByNameRound instead of RepSumByName. (merged trunk r1457390)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/conf/english-porter-comparison.alg
    lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/conf/english-porter-comparison.alg
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/conf/english-porter-comparison.alg?rev=1457391&r1=1457390&r2=1457391&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/conf/english-porter-comparison.alg (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/conf/english-porter-comparison.alg Sun
Mar 17 07:34:02 2013
@@ -48,4 +48,4 @@ docs.dir=reuters-out
 
     NewRound
 } : 5
-RepSumByName
+RepSumByNameRound

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1457391&r1=1457390&r2=1457391&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
(original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
Sun Mar 17 07:34:02 2013
@@ -376,6 +376,9 @@ public class AnalyzerFactoryTask extends
       instance.init(argMap);
       if (instance instanceof ResourceLoaderAware) {
         File baseDir = new File(getRunData().getConfig().get("work.dir", "work")).getAbsoluteFile();
+        if ( ! baseDir.isDirectory()) {
+          baseDir = new File(".").getAbsoluteFile();
+        }
         ((ResourceLoaderAware)instance).inform(new FilesystemResourceLoader(baseDir));
       }
       if (CharFilterFactory.class.isAssignableFrom(clazz)) {



Mime
View raw message