From: <ust...@us...> - 2008-08-15 12:44:11
|
Revision: 2859 http://clucene.svn.sourceforge.net/clucene/?rev=2859&view=rev Author: ustramooner Date: 2008-08-15 12:44:08 +0000 (Fri, 15 Aug 2008) Log Message: ----------- removed NO_* query exclusion macros Modified Paths: -------------- branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp Modified: branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h =================================================================== --- branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h 2008-08-15 12:41:14 UTC (rev 2858) +++ branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h 2008-08-15 12:44:08 UTC (rev 2859) @@ -289,18 +289,10 @@ //these functions may be defined under certain compilation conditions. //note that this functionality is deprecated, you should create your own queryparser //if you want to remove this functionality...it will be removed... be warned! -#ifdef NO_PREFIX_QUERY virtual CL_NS(search)::Query* GetPrefixQuery(const TCHAR* field,const TCHAR* termStr){ return NULL; } -#endif -#ifdef NO_FUZZY_QUERY virtual CL_NS(search)::Query* GetFuzzyQuery(const TCHAR* field,const TCHAR* termStr){ return NULL; } -#endif -#ifdef NO_RANGE_QUERY virtual CL_NS(search)::Query* GetRangeQuery(const TCHAR* field, const TCHAR* part1, const TCHAR* part2, bool inclusive) { return NULL; } -#endif -#ifdef NO_WILDCARD_QUERY virtual CL_NS(search)::Query* GetWildcardQuery(const TCHAR* field, TCHAR* termStr) { return NULL; } -#endif private: /** * matches for CONJUNCTION Modified: branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp =================================================================== --- branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp 2008-08-15 12:41:14 UTC (rev 2858) +++ branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp 2008-08-15 12:44:08 UTC (rev 2859) @@ -108,8 +108,8 @@ assertQueryEquals(tc,_T("term term term"), NULL, _T("term term term")); #ifdef _UCS2 - TCHAR tmp1[100]; - + TCHAR tmp1[100]; + lucene_utf8towcs(tmp1,"t\xc3\xbcrm term term",100); assertQueryEquals(tc,tmp1, NULL, tmp1); assertQueryEquals(tc,tmp1, &a, tmp1); @@ -223,12 +223,12 @@ assertQueryEquals(tc,_T("term*"), NULL, _T("term*")); assertQueryEquals(tc,_T("term*^2"), NULL, _T("term*^2.0")); -#ifndef NO_FUZZY_QUERY assertQueryEquals(tc,_T("term~"), NULL, _T("term~0.5")); + assertQueryEquals(tc,_T("term~0.5"), NULL, _T("term")); assertQueryEquals(tc,_T("term~^2"), NULL, _T("term^2.0~0.5")); assertQueryEquals(tc,_T("term^2~"), NULL, _T("term^2.0~0.5")); assertTrue(tc, _T("term~"), NULL,_T("FuzzyQuery"), _T("term~0.5")); -#endif + assertQueryEquals(tc,_T("term*germ"), NULL, _T("term*germ")); assertQueryEquals(tc,_T("term*germ^3"), NULL, _T("term*germ^3.0")); @@ -319,15 +319,10 @@ SUITE_ADD_TEST(suite, testNumber); SUITE_ADD_TEST(suite, testPunct); -#ifndef NO_FUZZY_QUERY SUITE_ADD_TEST(suite, testSlop); -#endif -#ifndef NO_RANGE_QUERY SUITE_ADD_TEST(suite, testRange); -#endif -#ifndef NO_WILDCARD_QUERY SUITE_ADD_TEST(suite, testWildcard); -#endif + return suite; } // EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |