[Clucene-cvs] SF.net SVN: clucene:[2870] branches/lucene2_3_2/src

[<ust...@us...>]

Revision: 2870
          http://clucene.svn.sourceforge.net/clucene/?rev=2870&view=rev
Author:   ustramooner
Date:     2008-08-18 16:52:18 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
fix queryparser deprecation of NO_* macros.
more fuzzy query tests 

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-17 17:18:51 UTC (rev 2869)
+++ branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h	2008-08-18 16:52:18 UTC (rev 2870)
@@ -285,14 +285,6 @@
 	//deprecated functions
 	_CL_DEPRECATED( setLowercaseExpandedTerms ) void  setLowercaseWildcardTerms(bool lowercaseWildcardTerms);
 	_CL_DEPRECATED( getLowercaseExpandedTerms ) bool  getLowercaseWildcardTerms() const;
-protected:
-	//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!
-	virtual CL_NS(search)::Query* GetPrefixQuery(const TCHAR* field,const TCHAR* termStr){ return NULL; }
-    virtual CL_NS(search)::Query* GetFuzzyQuery(const TCHAR* field,const TCHAR* termStr){ return NULL; }
-	virtual CL_NS(search)::Query* GetRangeQuery(const TCHAR* field, const TCHAR* part1, const TCHAR* part2, bool inclusive) { return NULL; }
-	virtual CL_NS(search)::Query* GetWildcardQuery(const TCHAR* field, TCHAR* termStr) { return NULL; }
 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-17 17:18:51 UTC (rev 2869)
+++ branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp	2008-08-18 16:52:18 UTC (rev 2870)
@@ -202,6 +202,9 @@
 	assertQueryEquals(tc,_T("\"term germ\"~2"), NULL, _T("\"term germ\"~2") );
 	assertQueryEquals(tc,_T("\"term germ\"~2 flork"), NULL, _T("\"term germ\"~2 flork") );
 	assertQueryEquals(tc,_T("\"term\"~2"), NULL, _T("term"));
+	assertQueryEquals(tc,_T("term~2"), NULL, _T("term"));
+	assertQueryEquals(tc,_T("term~0.5"), NULL, _T("term"));
+	assertQueryEquals(tc,_T("term~0.6"), NULL, _T("term"));
 	assertQueryEquals(tc,_T("\" \"~2 germ"), NULL, _T("germ"));
 	assertQueryEquals(tc,_T("\"term germ\"~2^2"), NULL, _T("\"term germ\"~2^2.0") );
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.