Index: autogen.sh =================================================================== RCS file: /cvsroot/clucene/Attic/autogen.sh,v retrieving revision 1.1.2.4 diff -u -p -r1.1.2.4 autogen.sh --- autogen.sh 22 Aug 2005 23:42:30 -0000 1.1.2.4 +++ autogen.sh 7 Oct 2005 19:38:03 -0000 @@ -20,8 +20,8 @@ DIE=0 DIE=1 } -AUTOMAKE=automake-1.9 -ACLOCAL=aclocal-1.9 +AUTOMAKE=automake-1.7 +ACLOCAL=aclocal-1.7 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { AUTOMAKE=automake Index: src/CLucene/index/FieldInfo.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/index/FieldInfo.h,v retrieving revision 1.4.2.3 diff -u -p -r1.4.2.3 FieldInfo.h --- src/CLucene/index/FieldInfo.h 21 Jul 2005 00:06:51 -0000 1.4.2.3 +++ src/CLucene/index/FieldInfo.h 7 Oct 2005 19:38:05 -0000 @@ -15,13 +15,13 @@ CL_NS_DEF(index) //Is field indexed? true = yes false = no bool isIndexed; - - // true if term vector for this field should be stored - bool storeTermVector; //What does number represent? const int32_t number; + // true if term vector for this field should be stored + bool storeTermVector; + //todo: its probably not quicker to intern the fieldname, //but it could save memory. do a benchmark with the two methods FieldInfo(const TCHAR* na, const bool tk, const int32_t nu, const bool stv): Index: src/CLucene/queryParser/QueryParser.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/queryParser/QueryParser.h,v retrieving revision 1.6.2.7 diff -u -p -r1.6.2.7 QueryParser.h --- src/CLucene/queryParser/QueryParser.h 5 Oct 2005 04:18:19 -0000 1.6.2.7 +++ src/CLucene/queryParser/QueryParser.h 7 Oct 2005 19:38:05 -0000 @@ -112,7 +112,7 @@ CL_NS_DEF(queryParser) //Extracts the first token from the Tokenlist tokenlist //and destroys it - void QueryParser::ExtractAndDeleteToken(void); + void ExtractAndDeleteToken(void); }; CL_NS_END #endif Index: src/CLucene/queryParser/QueryParserBase.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/queryParser/QueryParserBase.h,v retrieving revision 1.4.2.8 diff -u -p -r1.4.2.8 QueryParserBase.h --- src/CLucene/queryParser/QueryParserBase.h 5 Oct 2005 04:18:19 -0000 1.4.2.8 +++ src/CLucene/queryParser/QueryParserBase.h 7 Oct 2005 19:38:05 -0000 @@ -56,7 +56,7 @@ CL_NS_DEF(queryParser) CL_NS(search)::Query* GetRangeQuery(const TCHAR* field, CL_NS(analysis)::Analyzer* analyzer, const TCHAR* queryText, bool inclusive); //Analyzes the expanded term termStr with the StandardFilter and the LowerCaseFilter. - TCHAR *QueryParserBase::AnalyzeExpandedTerm(const TCHAR* field,const TCHAR* termStr); + TCHAR *AnalyzeExpandedTerm(const TCHAR* field,const TCHAR* termStr); #ifndef NO_PREFIX_QUERY @@ -72,12 +72,12 @@ CL_NS_DEF(queryParser) //unlikely to work properly with wildcard templates. Can be overridden by extending //classes, to provide custom handling for wild card queries, which may be necessary //due to missing analyzer calls. - CL_NS(search)::Query* QueryParserBase::GetPrefixQuery(const TCHAR* field,const TCHAR* termStr, bool lowercaseWildcardTerms); + CL_NS(search)::Query* GetPrefixQuery(const TCHAR* field,const TCHAR* termStr, bool lowercaseWildcardTerms); #endif #ifndef NO_FUZZY_QUERY //Factory method for generating a query (similar to getPrefixQuery}). Called when parser parses //an input term token that has the fuzzy suffix (~) appended. - CL_NS(search)::Query* QueryParserBase::GetFuzzyQuery(const TCHAR* field,const TCHAR* termStr); + CL_NS(search)::Query* GetFuzzyQuery(const TCHAR* field,const TCHAR* termStr); #endif bool lowercaseExpandedTerms; Index: src/CLucene/search/PhraseScorer.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/search/PhraseScorer.h,v retrieving revision 1.4.2.6 diff -u -p -r1.4.2.6 PhraseScorer.h --- src/CLucene/search/PhraseScorer.h 30 Sep 2005 23:27:18 -0000 1.4.2.6 +++ src/CLucene/search/PhraseScorer.h 7 Oct 2005 19:38:05 -0000 @@ -39,8 +39,8 @@ CL_NS_DEF(search) bool skipTo(int32_t target); - Explanation* PhraseScorer::explain(int32_t doc); - TCHAR* PhraseScorer::toString(); + Explanation* explain(int32_t doc); + TCHAR* toString(); protected: virtual float_t phraseFreq() =0; Index: src/CLucene/search/RangeQuery.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/search/RangeQuery.h,v retrieving revision 1.3.2.5 diff -u -p -r1.3.2.5 RangeQuery.h --- src/CLucene/search/RangeQuery.h 30 Sep 2005 23:27:18 -0000 1.3.2.5 +++ src/CLucene/search/RangeQuery.h 7 Oct 2005 19:38:05 -0000 @@ -42,7 +42,7 @@ CL_NS_DEF(search) ~RangeQuery(); const TCHAR* getQueryName() const; - static const TCHAR* RangeQuery::getClassName(); + static const TCHAR* getClassName(); Query* rewrite(CL_NS(index)::IndexReader* reader); Index: src/CLucene/search/Sort.h =================================================================== RCS file: /cvsroot/clucene/src/CLucene/search/Attic/Sort.h,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 Sort.h --- src/CLucene/search/Sort.h 30 Sep 2005 23:27:18 -0000 1.1.2.6 +++ src/CLucene/search/Sort.h 7 Oct 2005 19:38:05 -0000 @@ -117,7 +117,7 @@ public: class SortComparator: public SortComparatorSource { ScoreDocComparator* _this; public: - ScoreDocComparator* SortComparator::newComparator (CL_NS(index)::IndexReader* reader, TCHAR* fieldname); + ScoreDocComparator* newComparator (CL_NS(index)::IndexReader* reader, TCHAR* fieldname); SortComparator(ScoreDocComparator* _this):SortComparatorSource(){ this->_this = _this;