From: <ust...@us...> - 2007-03-15 09:06:18
|
Revision: 2523 http://svn.sourceforge.net/clucene/?rev=2523&view=rev Author: ustramooner Date: 2007-03-15 02:06:17 -0700 (Thu, 15 Mar 2007) Log Message: ----------- 0.9.16 compatibility fix. Modified Paths: -------------- trunk/src/CLucene/index/IndexReader.cpp trunk/src/CLucene/index/IndexReader.h Modified: trunk/src/CLucene/index/IndexReader.cpp =================================================================== --- trunk/src/CLucene/index/IndexReader.cpp 2007-03-03 13:33:59 UTC (rev 2522) +++ trunk/src/CLucene/index/IndexReader.cpp 2007-03-15 09:06:17 UTC (rev 2523) @@ -448,6 +448,38 @@ //Return the number of deleted documents return Counter; } + + TCHAR** IndexReader::getFieldNames(){ + CL_NS(util)::StringArrayWithDeletor array; + getFieldNames(IndexReader::ALL, array); + + array.setDoDelete(false); + TCHAR** ret = _CL_NEWARRAY(TCHAR*,array.size()+1); + int j=0; + CL_NS(util)::StringArrayWithDeletor::iterator itr = array.begin(); + while ( itr != array.end() ){ + ret[j]=*itr; + ++j;++itr; + } + ret[j]=NULL; + return ret; + } + TCHAR** IndexReader::getFieldNames(bool indexed){ + CL_NS(util)::StringArrayWithDeletor array; + getFieldNames(indexed?IndexReader::INDEXED:IndexReader::UNINDEXED, array); + + array.setDoDelete(false); + TCHAR** ret = _CL_NEWARRAY(TCHAR*,array.size()+1); + int j=0; + CL_NS(util)::StringArrayWithDeletor::iterator itr = array.begin(); + while ( itr != array.end() ){ + ret[j]=*itr; + ++j;++itr; + } + ret[j]=NULL; + return ret; + } + void IndexReader::close() { //Func - Closes files associated with this index and also saves any new deletions to disk. Modified: trunk/src/CLucene/index/IndexReader.h =================================================================== --- trunk/src/CLucene/index/IndexReader.h 2007-03-03 13:33:59 UTC (rev 2522) +++ trunk/src/CLucene/index/IndexReader.h 2007-03-15 09:06:17 UTC (rev 2523) @@ -156,6 +156,9 @@ * @see IndexReader.FieldOption */ virtual void getFieldNames(FieldOption fldOption, CL_NS(util)::StringArrayWithDeletor& retarray) = 0; + + _CL_DEPRECATED( getFieldNames(FieldOption, StringArrayWithDeletor&) ) virtual TCHAR** getFieldNames(); + _CL_DEPRECATED( getFieldNames(FieldOption, StringArrayWithDeletor&) ) virtual TCHAR** getFieldNames(bool indexed); /** Returns the byte-encoded normalization factor for the named field of * every document. This is used by the search code to score documents. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |