Revision: 7914 http://languagetool.svn.sourceforge.net/languagetool/?rev=7914&view=rev Author: dnaber Date: 2012-08-23 22:27:53 +0000 (Thu, 23 Aug 2012) Log Message: ----------- fast search: fix some queries with POS tag regex
Modified Paths: -------------- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/MatchingSentence.java trunk/JLanguageTool/src/dev/org/languagetool/dev/index/PatternRuleQueryBuilder.java trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java Modified: trunk/JLanguageTool/src/dev/org/languagetool/dev/index/MatchingSentence.java =================================================================== --- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/MatchingSentence.java 2012-08-23 21:39:18 UTC (rev 7913) +++ trunk/JLanguageTool/src/dev/org/languagetool/dev/index/MatchingSentence.java 2012-08-23 22:27:53 UTC (rev 7914) @@ -42,4 +42,9 @@ public List<RuleMatch> getRuleMatches() { return ruleMatches; } + + @Override + public String toString() { + return sentence; + } } Modified: trunk/JLanguageTool/src/dev/org/languagetool/dev/index/PatternRuleQueryBuilder.java =================================================================== --- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/PatternRuleQueryBuilder.java 2012-08-23 21:39:18 UTC (rev 7913) +++ trunk/JLanguageTool/src/dev/org/languagetool/dev/index/PatternRuleQueryBuilder.java 2012-08-23 22:27:53 UTC (rev 7914) @@ -154,7 +154,7 @@ // this to avoid the exception that all fields need to have the same field // when constructing the SpanNearQuery: //final RegexpQuery regexpQuery = getCaseSensitiveRegexQuery(POS_PREFIX + pos); - posQuery = getWrappedRegexQuery(element, POS_PREFIX + pos); + posQuery = getWrappedRegexQuery(element, POS_PREFIX + "(" + pos + ")"); //posQuery = new SpanMultiTermQueryWrapper<RegexpQuery>(regexpQuery); } else { if (element.getCaseSensitive()) { Modified: trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java =================================================================== --- trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java 2012-08-23 21:39:18 UTC (rev 7913) +++ trunk/JLanguageTool/src/test/org/languagetool/dev/index/PatternRuleQueryBuilderTest.java 2012-08-23 22:27:53 UTC (rev 7914) @@ -222,6 +222,8 @@ assertMatches(makeRule("<token postag=\"FOO\"></token>"), 0); assertMatches(makeRule("<token postag=\"[XW]RB\" postag_regexp=\"yes\"></token>"), 1); + assertMatches(makeRule("<token postag=\"FOO|WRB\" postag_regexp=\"yes\"></token>"), 1); + assertMatches(makeRule("<token postag=\"WRB|FOO\" postag_regexp=\"yes\"></token>"), 1); assertMatches(makeRule("<token postag=\"[XY]OO\" postag_regexp=\"yes\"></token>"), 0); // combine term and POS tag: 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