http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55512
Revision: 55512 Author: rainman Date: 2009-08-22 23:47:00 +0000 (Sat, 22 Aug 2009) Log Message: ----------- Put in some test cases for synonyms and split handling of uk/us synonyms. Modified Paths: -------------- branches/lucene-search-2.1/resources/dict/wordnet-en.txt.gz branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java Added Paths: ----------- branches/lucene-search-2.1/test/org/wikimedia/lsearch/analyzers/WordNetTest.java Modified: branches/lucene-search-2.1/resources/dict/wordnet-en.txt.gz =================================================================== (Binary files differ) Modified: branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java =================================================================== --- branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java 2009-08-22 22:48:09 UTC (rev 55511) +++ branches/lucene-search-2.1/src/org/wikimedia/lsearch/analyzers/WikiQueryParser.java 2009-08-22 23:47:00 UTC (rev 55512) @@ -1661,7 +1661,7 @@ Query sections = makeSectionsQuery(noStopWords,SECTIONS_BOOST); // wordnet synonyms - ArrayList<ArrayList<String>> wordnet = WordNet.replaceOne(noStopWords.extractFirst(),iid.getLangCode()); + ArrayList<ArrayList<String>> wordnet = WordNet.replaceOne(words.extractFirst(),iid.getLangCode()); BooleanQuery combined = new BooleanQuery(true); // combined various queries into mainphrase Added: branches/lucene-search-2.1/test/org/wikimedia/lsearch/analyzers/WordNetTest.java =================================================================== --- branches/lucene-search-2.1/test/org/wikimedia/lsearch/analyzers/WordNetTest.java (rev 0) +++ branches/lucene-search-2.1/test/org/wikimedia/lsearch/analyzers/WordNetTest.java 2009-08-22 23:47:00 UTC (rev 55512) @@ -0,0 +1,23 @@ +package org.wikimedia.lsearch.analyzers; + +import java.util.ArrayList; + +import org.wikimedia.lsearch.test.WikiTestCase; + +public class WordNetTest extends WikiTestCase { + + protected ArrayList<String> list(String[] strs){ + ArrayList<String> l = new ArrayList<String>(); + for( String s : strs ) + l.add(s); + return l; + } + public void testWordNet(){ + assertEquals("[[ten]]", WordNet.replaceOne(list(new String[]{"10"}),"en").toString()); + assertEquals("[[ten, riders]]", WordNet.replaceOne(list(new String[]{"10", "riders"}),"en").toString()); + assertEquals("[[in, united, kingdom]]", WordNet.replaceOne(list(new String[]{"in", "uk"}),"en").toString()); + assertEquals("[]",WordNet.replaceOne(list(new String[]{"in", "us"}),"en").toString()); + assertEquals("[[in, the, united, states]]",WordNet.replaceOne(list(new String[]{"in", "the", "us"}),"en").toString()); + } + +} _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs