Revision: 7833
http://languagetool.svn.sourceforge.net/languagetool/?rev=7833&view=rev
Author: dnaber
Date: 2012-08-11 21:14:46 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
wikipedia indexing: stop using deprecated IndexReader API
Modified Paths:
--------------
trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
trunk/JLanguageTool/src/test/org/languagetool/dev/index/IndexerSearcherTest.java
trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java
trunk/ltcommunity/grails-app/controllers/org/languagetool/RuleEditorController.groovy
Modified: trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
===================================================================
--- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
2012-08-11 21:06:55 UTC (rev 7832)
+++ trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Searcher.java
2012-08-11 21:14:46 UTC (rev 7833)
@@ -95,7 +95,7 @@
final PossiblyLimitedTopDocs limitedTopDocs = getTopDocs(indexSearcher,
query, sort);
final JLanguageTool languageTool = getLanguageToolWithOneRule(language,
rule);
final List<MatchingSentence> matchingSentences =
findMatchingSentences(indexSearcher, limitedTopDocs.topDocs, languageTool);
- final int sentencesChecked = getSentenceCheckCount(query,
limitedTopDocs.topDocs, indexSearcher);
+ final int sentencesChecked = getSentenceCheckCount(query, indexSearcher);
final SearcherResult searcherResult = new
SearcherResult(matchingSentences, sentencesChecked, query);
searcherResult.setResultIsTimeLimited(limitedTopDocs.resultIsTimeLimited);
return searcherResult;
@@ -124,7 +124,7 @@
throw new PatternRuleNotFoundException(ruleId, xmlRuleFile);
}
- private int getSentenceCheckCount(PossiblyRelaxedQuery query, TopDocs
topDocs, IndexSearcher indexSearcher) {
+ private int getSentenceCheckCount(PossiblyRelaxedQuery query, IndexSearcher
indexSearcher) {
final int sentencesChecked;
final int indexSize = indexSearcher.getIndexReader().numDocs();
if (query.isRelaxed) {
Modified:
trunk/JLanguageTool/src/test/org/languagetool/dev/index/IndexerSearcherTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/dev/index/IndexerSearcherTest.java
2012-08-11 21:06:55 UTC (rev 7832)
+++
trunk/JLanguageTool/src/test/org/languagetool/dev/index/IndexerSearcherTest.java
2012-08-11 21:14:46 UTC (rev 7833)
@@ -28,7 +28,6 @@
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
@@ -82,7 +81,7 @@
int ruleProblems = 0;
int relaxedQueryCount = 0;
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
searcher = new IndexSearcher(reader);
final List<Rule> rules = lt.getAllActiveRules();
@@ -232,7 +231,7 @@
new Element("back", false, false, false)
);
final PatternRule rule1 = new PatternRule("RULE1", Language.ENGLISH,
elements, "desc", "msg", "shortMsg");
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -257,7 +256,7 @@
);
final PatternRule rule1 = new PatternRule("RULE1", Language.ENGLISH,
elements, "desc", "msg", "shortMsg");
System.out.println(directory);
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -289,7 +288,7 @@
);
final PatternRule rule2 = new PatternRule("RULE", Language.ENGLISH,
elements2, "desc", "msg", "shortMsg");
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult1 =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -317,7 +316,7 @@
exceptionElem
);
final PatternRule rule1 = new PatternRule("RULE1", Language.ENGLISH,
elements, "desc", "msg", "shortMsg");
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -343,7 +342,7 @@
new Element("How", false, false, false)
);
final PatternRule rule1 = new PatternRule("RULE1", Language.ENGLISH,
elements, "desc", "msg", "shortMsg");
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -368,7 +367,7 @@
exceptionElem
);
final PatternRule rule1 = new PatternRule("RULE1", Language.ENGLISH,
elements, "desc", "msg", "shortMsg");
- final DirectoryReader reader = IndexReader.open(directory);
+ final DirectoryReader reader = DirectoryReader.open(directory);
try {
final IndexSearcher indexSearcher = new IndexSearcher(reader);
final SearcherResult searcherResult =
errorSearcher.findRuleMatchesOnIndex(rule1, Language.ENGLISH, indexSearcher);
@@ -388,7 +387,7 @@
directory = new RAMDirectory();
//directory = FSDirectory.open(new File("/tmp/lucenetest")); // for
debugging
Indexer.run(content, directory, Language.ENGLISH, false);
- searcher = new IndexSearcher(IndexReader.open(directory));
+ searcher = new IndexSearcher(DirectoryReader.open(directory));
}
/*public void testForManualDebug() throws Exception {
Modified:
trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java
2012-08-11 21:06:55 UTC (rev 7832)
+++
trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java
2012-08-11 21:14:46 UTC (rev 7833)
@@ -21,7 +21,7 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.IndexSearcher;
@@ -48,7 +48,7 @@
private static final Version LUCENE_VERSION = Version.LUCENE_40;
private IndexSearcher searcher;
- private IndexReader reader;
+ private DirectoryReader reader;
private Directory directory;
@Override
@@ -71,7 +71,7 @@
} finally {
writer.close();
}
- reader = IndexReader.open(directory);
+ reader = DirectoryReader.open(directory);
searcher = newSearcher(reader);
}
Modified:
trunk/ltcommunity/grails-app/controllers/org/languagetool/RuleEditorController.groovy
===================================================================
---
trunk/ltcommunity/grails-app/controllers/org/languagetool/RuleEditorController.groovy
2012-08-11 21:06:55 UTC (rev 7832)
+++
trunk/ltcommunity/grails-app/controllers/org/languagetool/RuleEditorController.groovy
2012-08-11 21:14:46 UTC (rev 7833)
@@ -25,7 +25,7 @@
import org.languagetool.dev.index.SearcherResult
import org.languagetool.rules.patterns.PatternRuleLoader
import org.languagetool.rules.IncorrectExample
-import org.apache.lucene.index.IndexReader
+import org.apache.lucene.index.DirectoryReader
/**
* Editor that helps with creating the XML for simple rules.
@@ -112,7 +112,7 @@
File indexDir = new File(indexDirTemplate.replace("LANG",
language.getShortName()))
if (indexDir.isDirectory()) {
def directory = FSDirectory.open(indexDir)
- IndexReader indexReader = IndexReader.open(directory)
+ DirectoryReader indexReader = DirectoryReader.open(directory)
SearcherResult searcherResult = null
try {
IndexSearcher indexSearcher = new IndexSearcher(indexReader)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
Languagetool-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
