Menu
▾
▴
[Clucene-cvs] SF.net SVN: clucene:[3009] branches/lucene2_3_2
|
From: <ust...@us...> - 2009-06-11 17:34:30
|
Revision: 3009
http://clucene.svn.sourceforge.net/clucene/?rev=3009&view=rev
Author: ustramooner
Date: 2009-06-11 17:34:23 +0000 (Thu, 11 Jun 2009)
Log Message:
-----------
Merge branch 'master' into svn
Modified Paths:
--------------
branches/lucene2_3_2/CMakeLists.txt
branches/lucene2_3_2/COPYING
branches/lucene2_3_2/INSTALL
branches/lucene2_3_2/cmake/CreateClucenePackages.cmake
branches/lucene2_3_2/configure
branches/lucene2_3_2/dist-test.sh
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestSnowball.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/SimpleHTMLFormatter.h
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenGroup.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.h
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballFilter.h
branches/lucene2_3_2/src/core/CLucene/CLConfig.h
branches/lucene2_3_2/src/core/CLucene/CLMonolithic.cpp
branches/lucene2_3_2/src/core/CLucene/StdHeader.cpp
branches/lucene2_3_2/src/core/CLucene/StdHeader.h
branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.h
branches/lucene2_3_2/src/core/CLucene/analysis/Analyzers.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/Analyzers.h
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardAnalyzer.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardAnalyzer.h
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardFilter.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardFilter.h
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardTokenizer.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardTokenizer.h
branches/lucene2_3_2/src/core/CLucene/debug/error.cpp
branches/lucene2_3_2/src/core/CLucene/debug/error.h
branches/lucene2_3_2/src/core/CLucene/debug/lucenebase.h
branches/lucene2_3_2/src/core/CLucene/debug/mem.h
branches/lucene2_3_2/src/core/CLucene/document/DateTools.cpp
branches/lucene2_3_2/src/core/CLucene/document/DateTools.h
branches/lucene2_3_2/src/core/CLucene/document/Document.cpp
branches/lucene2_3_2/src/core/CLucene/document/Document.h
branches/lucene2_3_2/src/core/CLucene/document/Field.cpp
branches/lucene2_3_2/src/core/CLucene/document/Field.h
branches/lucene2_3_2/src/core/CLucene/document/FieldSelector.cpp
branches/lucene2_3_2/src/core/CLucene/document/NumberTools.cpp
branches/lucene2_3_2/src/core/CLucene/index/CompoundFile.cpp
branches/lucene2_3_2/src/core/CLucene/index/FieldInfos.cpp
branches/lucene2_3_2/src/core/CLucene/index/FieldsReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/FieldsWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNames.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexModifier.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexModifier.h
branches/lucene2_3_2/src/core/CLucene/index/IndexReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexReader.h
branches/lucene2_3_2/src/core/CLucene/index/IndexWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexWriter.h
branches/lucene2_3_2/src/core/CLucene/index/MultiReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultiReader.h
branches/lucene2_3_2/src/core/CLucene/index/Payload.cpp
branches/lucene2_3_2/src/core/CLucene/index/Payload.h
branches/lucene2_3_2/src/core/CLucene/index/SegmentInfos.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentMerger.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermDocs.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermEnum.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermPositions.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermVector.cpp
branches/lucene2_3_2/src/core/CLucene/index/Term.cpp
branches/lucene2_3_2/src/core/CLucene/index/Term.h
branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/TermInfosWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/TermVector.h
branches/lucene2_3_2/src/core/CLucene/index/TermVectorReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/TermVectorWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/Terms.h
branches/lucene2_3_2/src/core/CLucene/index/_CompoundFile.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldInfo.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldInfos.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldsReader.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldsWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_IndexFileNames.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentHeader.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentInfos.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentMergeInfo.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentMergeQueue.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentMerger.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentTermEnum.h
branches/lucene2_3_2/src/core/CLucene/index/_Term.h
branches/lucene2_3_2/src/core/CLucene/index/_TermInfosReader.h
branches/lucene2_3_2/src/core/CLucene/index/_TermInfosWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_TermVector.h
branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.h
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParserTokenManager.h
branches/lucene2_3_2/src/core/CLucene/queryParser/_FastCharStream.h
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/QueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/QueryParser.h
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/QueryParserBase.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanClause.h
branches/lucene2_3_2/src/core/CLucene/search/BooleanQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanQuery.h
branches/lucene2_3_2/src/core/CLucene/search/BooleanScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanScorer2.cpp
branches/lucene2_3_2/src/core/CLucene/search/Compare.h
branches/lucene2_3_2/src/core/CLucene/search/ConjunctionScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/DisjunctionSumScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/ExactPhraseScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/Explanation.cpp
branches/lucene2_3_2/src/core/CLucene/search/Explanation.h
branches/lucene2_3_2/src/core/CLucene/search/FieldCacheImpl.cpp
branches/lucene2_3_2/src/core/CLucene/search/Filter.h
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h
branches/lucene2_3_2/src/core/CLucene/search/HitQueue.cpp
branches/lucene2_3_2/src/core/CLucene/search/Hits.h
branches/lucene2_3_2/src/core/CLucene/search/IndexSearcher.cpp
branches/lucene2_3_2/src/core/CLucene/search/IndexSearcher.h
branches/lucene2_3_2/src/core/CLucene/search/MultiSearcher.cpp
branches/lucene2_3_2/src/core/CLucene/search/PhraseQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/PhraseQuery.h
branches/lucene2_3_2/src/core/CLucene/search/PhraseScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/PrefixQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/PrefixQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Query.h
branches/lucene2_3_2/src/core/CLucene/search/RangeFilter.h
branches/lucene2_3_2/src/core/CLucene/search/RangeQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/RangeQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Scorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/Scorer.h
branches/lucene2_3_2/src/core/CLucene/search/ScorerDocQueue.cpp
branches/lucene2_3_2/src/core/CLucene/search/ScorerDocQueue.h
branches/lucene2_3_2/src/core/CLucene/search/SearchHeader.cpp
branches/lucene2_3_2/src/core/CLucene/search/SearchHeader.h
branches/lucene2_3_2/src/core/CLucene/search/Searchable.h
branches/lucene2_3_2/src/core/CLucene/search/Similarity.h
branches/lucene2_3_2/src/core/CLucene/search/SloppyPhraseScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/Sort.cpp
branches/lucene2_3_2/src/core/CLucene/search/Sort.h
branches/lucene2_3_2/src/core/CLucene/search/TermQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/TermQuery.h
branches/lucene2_3_2/src/core/CLucene/search/TermScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardQuery.h
branches/lucene2_3_2/src/core/CLucene/search/WildcardTermEnum.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardTermEnum.h
branches/lucene2_3_2/src/core/CLucene/search/_BooleanScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_BooleanScorer2.h
branches/lucene2_3_2/src/core/CLucene/search/_ConjunctionScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_DisjunctionSumScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_ExactPhraseScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_FieldCacheImpl.h
branches/lucene2_3_2/src/core/CLucene/search/_PhraseQueue.h
branches/lucene2_3_2/src/core/CLucene/search/_PhraseScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_SloppyPhraseScorer.h
branches/lucene2_3_2/src/core/CLucene/search/_TermScorer.h
branches/lucene2_3_2/src/core/CLucene/store/Directory.cpp
branches/lucene2_3_2/src/core/CLucene/store/Directory.h
branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/IndexInput.cpp
branches/lucene2_3_2/src/core/CLucene/store/IndexInput.h
branches/lucene2_3_2/src/core/CLucene/store/IndexOutput.cpp
branches/lucene2_3_2/src/core/CLucene/store/IndexOutput.h
branches/lucene2_3_2/src/core/CLucene/store/Lock.cpp
branches/lucene2_3_2/src/core/CLucene/store/Lock.h
branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp
branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h
branches/lucene2_3_2/src/core/CLucene/store/MMapInput.cpp
branches/lucene2_3_2/src/core/CLucene/store/RAMDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/RAMDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/TransactionalRAMDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/_Lock.h
branches/lucene2_3_2/src/core/CLucene/store/_MMap.h
branches/lucene2_3_2/src/core/CLucene/store/_RAMDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/_TransactionalRAMDirectory.h
branches/lucene2_3_2/src/core/CLucene/util/Array.h
branches/lucene2_3_2/src/core/CLucene/util/BitSet.h
branches/lucene2_3_2/src/core/CLucene/util/CLStreams.h
branches/lucene2_3_2/src/core/CLucene/util/Equators.cpp
branches/lucene2_3_2/src/core/CLucene/util/Equators.h
branches/lucene2_3_2/src/core/CLucene/util/MD5Digester.cpp
branches/lucene2_3_2/src/core/CLucene/util/PriorityQueue.h
branches/lucene2_3_2/src/core/CLucene/util/Reader.cpp
branches/lucene2_3_2/src/core/CLucene/util/StringIntern.cpp
branches/lucene2_3_2/src/core/CLucene/util/ThreadLocal.cpp
branches/lucene2_3_2/src/core/CLucene/util/VoidList.h
branches/lucene2_3_2/src/core/CLucene/util/VoidMap.h
branches/lucene2_3_2/src/core/CLucene/util/_Arrays.h
branches/lucene2_3_2/src/core/CMakeLists.txt
branches/lucene2_3_2/src/demo/CMakeLists.txt
branches/lucene2_3_2/src/demo/IndexFiles.cpp
branches/lucene2_3_2/src/demo/Main.cpp
branches/lucene2_3_2/src/demo/SearchFiles.cpp
branches/lucene2_3_2/src/demo/Statistics.cpp
branches/lucene2_3_2/src/shared/CLucene/LuceneThreads.h
branches/lucene2_3_2/src/shared/CLucene/SharedHeader.cpp
branches/lucene2_3_2/src/shared/CLucene/SharedHeader.h
branches/lucene2_3_2/src/shared/CLucene/_clucene-config.h.cmake
branches/lucene2_3_2/src/shared/CLucene/clucene-config.h.cmake
branches/lucene2_3_2/src/shared/CLucene/config/_threads.h
branches/lucene2_3_2/src/shared/CLucene/config/repl_lltot.cpp
branches/lucene2_3_2/src/shared/CLucene/config/repl_tchar.h
branches/lucene2_3_2/src/shared/CLucene/config/repl_wchar.h
branches/lucene2_3_2/src/shared/CLucene/config/threads.cpp
branches/lucene2_3_2/src/shared/CLucene/config/utf8.cpp
branches/lucene2_3_2/src/shared/CLucene/debug/_condition.h
branches/lucene2_3_2/src/shared/CLucene/debug/condition.cpp
branches/lucene2_3_2/src/shared/CLucene/util/Misc.cpp
branches/lucene2_3_2/src/shared/CLucene/util/Misc.h
branches/lucene2_3_2/src/shared/CLucene/util/StringBuffer.cpp
branches/lucene2_3_2/src/shared/CLucene/util/StringBuffer.h
branches/lucene2_3_2/src/shared/CMakeLists.txt
branches/lucene2_3_2/src/test/CLMonolithic_Test.cpp
branches/lucene2_3_2/src/test/CMakeLists.txt
branches/lucene2_3_2/src/test/CuTest.cpp
branches/lucene2_3_2/src/test/CuTest.h
branches/lucene2_3_2/src/test/analysis/TestAnalysis.cpp
branches/lucene2_3_2/src/test/analysis/TestAnalyzers.cpp
branches/lucene2_3_2/src/test/data/readme.txt
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.f0
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.f1
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.fdt
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.fdx
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.frq
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.prx
branches/lucene2_3_2/src/test/data/reuters-21578-index/_z.tis
branches/lucene2_3_2/src/test/data/reuters-21578-index/segments
branches/lucene2_3_2/src/test/debug/TestError.cpp
branches/lucene2_3_2/src/test/document/TestDocument.cpp
branches/lucene2_3_2/src/test/index/TestIndexWriter.cpp
branches/lucene2_3_2/src/test/index/TestReuters.cpp
branches/lucene2_3_2/src/test/index/TestUtf8.cpp
branches/lucene2_3_2/src/test/queryParser/TestMultiFieldQueryParser.cpp
branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp
branches/lucene2_3_2/src/test/search/TestForDuplicates.cpp
branches/lucene2_3_2/src/test/search/TestQueries.cpp
branches/lucene2_3_2/src/test/search/TestSearch.cpp
branches/lucene2_3_2/src/test/search/TestSort.cpp
branches/lucene2_3_2/src/test/search/TestTermVector.cpp
branches/lucene2_3_2/src/test/store/TestStore.cpp
branches/lucene2_3_2/src/test/test.h
branches/lucene2_3_2/src/test/testall.cpp
branches/lucene2_3_2/src/test/tests.cpp
Added Paths:
-----------
branches/lucene2_3_2/README.PACKAGE
branches/lucene2_3_2/src/core/CLucene/document/FieldSelector.h
branches/lucene2_3_2/src/core/CLucene/index/DirectoryIndexReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/DirectoryIndexReader.h
branches/lucene2_3_2/src/core/CLucene/index/DocumentsWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/DocumentsWriterThreadState.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexDeletionPolicy.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexDeletionPolicy.h
branches/lucene2_3_2/src/core/CLucene/index/IndexFileDeleter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNameFilter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNameFilter.h
branches/lucene2_3_2/src/core/CLucene/index/MergePolicy.cpp
branches/lucene2_3_2/src/core/CLucene/index/MergePolicy.h
branches/lucene2_3_2/src/core/CLucene/index/MergeScheduler.cpp
branches/lucene2_3_2/src/core/CLucene/index/MergeScheduler.h
branches/lucene2_3_2/src/core/CLucene/index/MultiSegmentReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultipleTermPositions.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultipleTermPositions.h
branches/lucene2_3_2/src/core/CLucene/index/SkipListReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/SkipListWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/_DocumentsWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_IndexFileDeleter.h
branches/lucene2_3_2/src/core/CLucene/index/_MultiSegmentReader.h
branches/lucene2_3_2/src/core/CLucene/index/_SkipListReader.h
branches/lucene2_3_2/src/core/CLucene/index/_SkipListWriter.h
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryToken.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryToken.h
branches/lucene2_3_2/src/core/CLucene/search/MatchAllDocsQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/MatchAllDocsQuery.h
branches/lucene2_3_2/src/core/CLucene/search/MultiPhraseQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/MultiPhraseQuery.h
branches/lucene2_3_2/src/core/files_list.txt
branches/lucene2_3_2/src/core/libclucene.pc.cmake
branches/lucene2_3_2/src/shared/CLucene/util/deflate.cpp
branches/lucene2_3_2/src/shared/CLucene/util/zlib/
branches/lucene2_3_2/src/shared/CLucene/util/zlib/adler32.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/compress.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/crc32.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/crc32.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/deflate.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/deflate.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/gzio.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffast.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffast.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffixed.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inflate.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inflate.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inftrees.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inftrees.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/trees.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/trees.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zconf.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zlib.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zutil.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zutil.h
branches/lucene2_3_2/src/test/index/TestIndexReader.cpp
branches/lucene2_3_2/src/test/index/TestThreading.cpp
Removed Paths:
-------------
branches/lucene2_3_2/src/core/CLucene/document/_FieldSelector.h
branches/lucene2_3_2/src/core/CLucene/files_list.txt
branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/DefaultSkipListReader.h
branches/lucene2_3_2/src/core/CLucene/index/DocumentWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultiLevelSkipListReader.h
branches/lucene2_3_2/src/core/CLucene/index/_DocumentWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_MultiReader.h
branches/lucene2_3_2/src/core/CLucene/queryParser/CharStream.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/Token.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/Token.h
branches/lucene2_3_2/src/core/CLucene/util/VoidMapSetDefinitions.h
Property Changed:
----------------
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNames.cpp
branches/lucene2_3_2/src/core/CLucene/index/_IndexFileNames.h
branches/lucene2_3_2/src/core/CLucene/search/BooleanScorer2.cpp
branches/lucene2_3_2/src/core/CLucene/search/DisjunctionSumScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/ScorerDocQueue.cpp
branches/lucene2_3_2/src/core/CLucene/search/ScorerDocQueue.h
branches/lucene2_3_2/src/core/CLucene/search/_BooleanScorer2.h
branches/lucene2_3_2/src/core/CLucene/search/_DisjunctionSumScorer.h
branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h
Modified: branches/lucene2_3_2/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/CMakeLists.txt 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/CMakeLists.txt 2009-06-11 17:34:23 UTC (rev 3009)
@@ -9,6 +9,7 @@
SET(CLUCENE_VERSION_MINOR "9")
SET(CLUCENE_VERSION_REVISION "23")
SET(CLUCENE_VERSION_PATCH "0")
+SET(CLUCENE_INT_VERSION 92300)
SET(CLUCENE_VERSION "${CLUCENE_VERSION_MAJOR}.${CLUCENE_VERSION_MINOR}.${CLUCENE_VERSION_REVISION}.${CLUCENE_VERSION_PATCH}")
SET(CLUCENE_SOVERSION "${CLUCENE_VERSION_MAJOR}.${CLUCENE_VERSION_MINOR}.${CLUCENE_VERSION_REVISION}")
@@ -74,6 +75,9 @@
SET(LUCENE_SYS_INCLUDES "" CACHE PATH
"location for non-system independent files. defaults to CMAKE_INSTALL_PREFIX. see INSTALL documentation for further information."
)
+#install path options
+SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+SET(LIB_DESTINATION "lib${LIB_SUFFIX}")
SET ( ENABLE_COMPILE_TESTS_VALUE ON )
@@ -89,11 +93,6 @@
#check flags...
INCLUDE (TestCXXAcceptsFlag)
IF ( CMAKE_COMPILER_IS_GNUCC )
- CHECK_CXX_ACCEPTS_FLAG(-g GccFlagG)
- IF ( GccFlagG )
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
- ENDIF ( GccFlagG )
-
CHECK_CXX_ACCEPTS_FLAG(-pg GccFlagPg)
IF ( GccFlagPg )
OPTION(ENABLE_GPROF
@@ -115,18 +114,11 @@
ENDIF(CMAKE_COMPILER_IS_GNUCC)
-IF (ENABLE_PACKAGING)
- INCLUDE(CreateClucenePackages)
- CREATE_CLUCENE_PACKAGES()
-ENDIF ( ENABLE_PACKAGING)
-
-
#Single output directory for building all executables and libraries.
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable Output Directory" FORCE)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Library Output Directory" FORCE)
#add tests
-#todo: why does 'make test' not work???
ENABLE_TESTING()
ADD_TEST(SimpleTest ${EXECUTABLE_OUTPUT_PATH}/cl_test )
@@ -142,6 +134,7 @@
ADD_SUBDIRECTORY (src/demo EXCLUDE_FROM_ALL)
IF ( BUILD_CONTRIBS )
ADD_SUBDIRECTORY (src/contribs EXCLUDE_FROM_ALL)
+ SET(BUILD_CONTRIBS_LIB 1)
ENDIF ( BUILD_CONTRIBS )
IF ( BUILD_CONTRIBS_LIB )
ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
@@ -155,3 +148,8 @@
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+#this must go last...
+IF (ENABLE_PACKAGING)
+ INCLUDE(CreateClucenePackages)
+ENDIF ( ENABLE_PACKAGING)
Modified: branches/lucene2_3_2/COPYING
===================================================================
--- branches/lucene2_3_2/COPYING 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/COPYING 2009-06-11 17:34:23 UTC (rev 3009)
@@ -90,9 +90,35 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+the src/core/util/Compress.cpp component:
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.3, July 18th, 2005
+ Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly jl...@gz...
+ Mark Adler ma...@al...
+
+*/
+
+
+
CLUCENE CONTRIBUTIONS CODE:
PorterStemmer code: couldn't find license. This component is deprecated and will be removed very soon.
Modified: branches/lucene2_3_2/INSTALL
===================================================================
--- branches/lucene2_3_2/INSTALL 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/INSTALL 2009-06-11 17:34:23 UTC (rev 3009)
@@ -155,8 +155,22 @@
# DMALLOC_OPTIONS=medium,log=dmalloc.log.txt
# export DMALLOC_OPTIONS
+UPDATE: when i upgrade my machine to Ubuntu 9.04, dmalloc stopped working (caused
+clucene to crash).
+
+Performance with callgrind
+--------------------------
+Really simple
+
+valgrind --tool=callgrind <command: e.g. bin/cl_test>
+this will create a file like callgrind.out.12345. you can open this with kcachegrind or some
+tool like that.
+
+
Performance with gprof
----------------------
+Note: I recommend callgrind, it works much better.
+
Compile with gprof turned on (ENABLE_GPROF in cmake gui or using ccmake).
I've found (at least on windows cygwin) that gprof wasn't working over
dll boundaries, running the cl_test-pedantic monolithic build worked better.
@@ -165,6 +179,32 @@
compiled application has exited:
# gprof bin/cl_test-pedantic.exe gmon.out >gprof.txt
+Code coverage with gcov
+-----------------------
+To create a code coverage report of the test, you can use gcov. Here are the
+steps I followed to create a nice html report. You'll need the lcov package
+installed to generate html. Also, I recommend using an out-of-source build
+directory as there are lots of files that will be generated.
+
+NOTE: you must have lcov installed for this to work
+
+* It is normally recommended to compile with no optimisations, so change CMAKE_BUILD_TYPE
+to Debug.
+
+* I have created a cl_test-gcov target which contains the necessary gcc switches
+already. So all you need to do is
+# make test-gcov
+
+If everything goes well, there will be a directory called code-coverage containing the report.
+
+If you want to do this process manually, then:
+# lcov --directory ./src/test/CMakeFiles/cl_test-gcov.dir/__/core/CLucene -c -o clucene-coverage.info
+# lcov --remove clucene-coverage.info "/usr/*" > clucene-coverage.clean
+# genhtml -o clucene-coverage clucene-coverage.clean
+
+If both those commands pass, then there will be a clucene coverage report in the
+clucene-coverage directory.
+
Benchmarks
----------
Very little benchmarking has been done on clucene. Andi Vajda posted some
Added: branches/lucene2_3_2/README.PACKAGE
===================================================================
--- branches/lucene2_3_2/README.PACKAGE (rev 0)
+++ branches/lucene2_3_2/README.PACKAGE 2009-06-11 17:34:23 UTC (rev 3009)
@@ -0,0 +1,11 @@
+CLucene is a C++ port of the popular Apache Lucene search engine
+(http://lucene.apache.org/java). It is released under LGPL or the Apache
+License.
+
+CLucene aims to be a high-speed alternative to Java Lucene, its API is very
+similar to that of the Java version. CLucene has recently been brought up to
+date with Lucene 2.3.2. It contains most of the same functionality as the
+Java version.
+
+This package contains the files necessary for running applications that
+use the libclucene library.
Modified: branches/lucene2_3_2/cmake/CreateClucenePackages.cmake
===================================================================
--- branches/lucene2_3_2/cmake/CreateClucenePackages.cmake 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/cmake/CreateClucenePackages.cmake 2009-06-11 17:34:23 UTC (rev 3009)
@@ -1,7 +1,5 @@
#Creates all the relevant packages
-MACRO( CREATE_CLUCENE_PACKAGES )
-
#Rules for version:
#MAJOR and MINOR versions are purely political
#REVISION version MUST be revised if the headers or compatibility change
@@ -15,15 +13,23 @@
SET(CPACK_PACKAGE_VERSION ${CLUCENE_VERSION})
SET(CPACK_PACKAGE_SOVERSION ${CLUCENE_SOVERSION})
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CLucene")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "library for full-featured text search engine (runtime)")
SET(CPACK_PACKAGE_VENDOR "Ben van Klinken")
+SET(CPACK_PACKAGE_CONTACT "clu...@li...")
+SET(CPACK_PACKAGE_NAME "libclucene1")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CLucene - a C++ search engine, ported from the popular Apache Lucene")
SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.PACKAGE")
+#so, what are we going to install?
+SET(CPACK_INSTALL_CMAKE_PROJECTS
+ "${CMAKE_BINARY_DIR};clucene-core;ALL;/"
+ "${CMAKE_BINARY_DIR};clucene-shared;ALL;/")
+SET(CPACK_COMPONENTS_ALL development runtime)
SET(CPACK_GENERATOR "TGZ")
SET(CPACK_PACKAGE_FILE_NAME "clucene-core-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_NAME}")
@@ -34,9 +40,22 @@
ENDIF(WIN32 AND NOT UNIX)
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "clucene-core-${CPACK_PACKAGE_VERSION}-Source")
+#specific packaging requirements:
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), libgcc1 (>= 1:4.1.1-21), libstdc++6 (>= 4.1.1-21)")
+
+
#don't include the current binary dir.
get_filename_component(clucene_BINARY_DIR_name ${clucene_BINARY_DIR} NAME)
-SET(CPACK_SOURCE_IGNORE_FILES "/\\\\.svn/;\\\\.swp$;\\\\.#;/#;.*~;.*\\\\.tmp;/${clucene_BINARY_DIR_name}/")
+SET(CPACK_SOURCE_IGNORE_FILES
+ "/\\\\.svn/"
+ "/\\\\.git/"
+ "\\\\.swp$"
+ "\\\\.#;/#"
+ ".*~"
+ ".*\\\\.tmp"
+ ".*\\\\.save"
+ "/${clucene_BINARY_DIR_name}/"
+)
IF(WIN32 AND NOT UNIX)
# There is a bug in NSI that does not handle full unix paths properly. Make
@@ -55,9 +74,7 @@
ENDIF(WIN32 AND NOT UNIX)
#SET(CPACK_PACKAGE_EXECUTABLES "MyExecutable" "My Executable")
-INCLUDE(CPack)
-
ADD_CUSTOM_TARGET(dist-package
COMMAND rsync -avP -e ssh ${CPACK_PACKAGE_FILE_NAME}.* ust...@fr...:uploads/
# DEPENDS package
@@ -66,4 +83,6 @@
COMMAND rsync -avP -e ssh ${CPACK_SOURCE_PACKAGE_FILE_NAME}.* ust...@fr...:uploads/
# DEPENDS package_source
)
-ENDMACRO( CREATE_CLUCENE_PACKAGES )
+
+#this must be last
+INCLUDE(CPack)
Modified: branches/lucene2_3_2/configure
===================================================================
--- branches/lucene2_3_2/configure 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/configure 2009-06-11 17:34:23 UTC (rev 3009)
@@ -1,2 +1,6 @@
-cmake .
+#!/bin/bash
+PWD=`dirname $0`
+PWD=`cd $PWD && pwd`
+
+cmake $PWD $@
Modified: branches/lucene2_3_2/dist-test.sh
===================================================================
--- branches/lucene2_3_2/dist-test.sh 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/dist-test.sh 2009-06-11 17:34:23 UTC (rev 3009)
@@ -27,7 +27,7 @@
t_exports=0
FAIL=0
-if [ $# == 0 ]; then
+if [ $# -eq 0 ]; then
usage
else
while [ "$1" != "" ]; do
@@ -56,7 +56,7 @@
done
fi
-if [ $t_all == 1 ]; then
+if [ $t_all -eq 1 ]; then
t_env=1
t_c_all=1
t_c_h=1
@@ -81,16 +81,14 @@
}
-if [ $t_env == 1 ]; then
+if [ $t_env -eq 1 ]; then
rm -fdr $TMP 2>/dev/null
mkdir $TMP
#create header file for testing of symbols in headers.
echo "#include \"CLucene/StdHeader.h"\" >$TMP/pub-headers.cpp
-fi
-#iterate all headers
-if [ $t_env == 1 ]; then
+ #iterate all headers
for H in `find ../src/shared/CLucene| grep "\.h$"` `find ../src/core/CLucene| grep "\.h$"`; do
BH=`basename "$H"`
DN=`dirname "$H"`
@@ -107,63 +105,60 @@
fi
fi
done
-fi
-
-if [ $t_env == 1 ]; then
+
echo "int main(){return 0;}" >>$TMP/pub-headers.cpp
fi
-#find inline code:
-if [ $t_inline == 1 ]; then
- if [ $t_env == 1 ]; then
- cmake -DENABLE_CLDOCS:BOOLEAN=TRUE .
- make doc
- if [ $? != 0 ]; then
- exit 1
- fi
- fi
-fi
################################################
#now the environment is finished being setup...
################################################
echo "Starting tests..."
-if [ $t_c_h == 1 ] || [ $t_ifdefs == 1 ] || [ $t_exports == 1 ]; then
+if [ $t_c_h -eq 1 ] || [ $t_ifdefs -eq 1 ] || [ $t_exports -eq 1 ]; then
for H in `find $TMP/src | grep "\.h$"`; do
BH=`basename "$H"`
DH=`dirname "${H:3}"`
- if [ $t_ifdefs == 1 ]; then
+ if [ $t_ifdefs -eq 1 ]; then
checkForIfdefs $H
fi
#check that all classes are exported
- if [ $t_exports == 1 ]; then
- XX=`awk '/^[ \t]*(class|struct)/ { print $line }' $H| grep -v ";$"| grep -v CLUCENE_EXPORT| grep -v CLUCENE_INLINE_EXPORT| grep -v CLUCENE_SHARED_EXPORT| grep -v CLUCENE_SHARED_INLINE_EXPORT`
- if [ "$XX" != "" ]; then
- echo "$H has unexported class: $XX"
- echo ""
- FAIL=1
- fi
+ if [ $t_exports -eq 1 ]; then
+ if [ "${H:0:1}" == "_" ]; then
+ #internal headers... none must be exported
+ XX=`awk '/^[ \t]*(class|struct)/ { print $line }' $H| grep -v ";$"| grep -v CLUCENE_EXPORT| grep -v CLUCENE_INLINE_EXPORT| grep -v CLUCENE_SHARED_EXPORT| grep -v CLUCENE_SHARED_INLINE_EXPORT`
+ if [ "$XX" == "" ]; then
+ echo "$H has exported class: $XX"
+ echo ""
+ FAIL=1
+ fi
+ else
+ #external headers... all must be exported
+ XX=`awk '/^[ \t]*(class|struct)/ { print $line }' $H| grep -v ";$"| grep -v CLUCENE_EXPORT| grep -v CLUCENE_INLINE_EXPORT| grep -v CLUCENE_SHARED_EXPORT| grep -v CLUCENE_SHARED_INLINE_EXPORT`
+ if [ "$XX" != "" ]; then
+ echo "$H has unexported class: $XX"
+ echo ""
+ FAIL=1
+ fi
+ fi
fi
#test that each header compiles independently...
- if [ $t_c_h == 1 ] && [ "${H:7}" != "disttest/src/core/CLucene/util/Reader.h" ]; then
+ if [ $t_c_h -eq 1 ] && [ "${H:7}" != "disttest/src/core/CLucene/util/Reader.h" ]; then
echo "Test that $H compiles seperately..."
echo "#include \"CLucene/StdHeader.h"\" >$TMP/pub-header.cpp
echo "#include \"$H"\" >>$TMP/pub-header.cpp
- echo "int main(){return 0;}" >>$TMP/pub-header.cpp
+ echo "int main(){ return 0; }" >>"$TMP/pub-header.cpp"
g++ -I. -I$TMP/src/shared -I./src/shared -I$TMP/src/core $TMP/pub-header.cpp
- if [ $? != 0 ]; then
- FAIL=1;
- fi
+ if [ $? -ne 0 ]; then FAIL=1; fi
fi
done
fi
#iterate all our code...
-if [ $t_license == 1 ]; then
+if [ $t_license -eq 1 ]; then
for H in `find ../src`; do
BH=`basename "$H"`
BH_len=${#BH}
@@ -182,11 +177,19 @@
#test if headers can compile together by themselves:
-if [ $t_c_all == 1 ]; then
+if [ $t_c_all -eq 1 ]; then
g++ -I$TMP/src -I$TMP/src/shared -I$TMP/src/core $TMP/pub-headers.cpp -I./src/shared
fi
-if [ $t_inline == 1 ]; then
+if [ $t_inline -eq 1 ]; then
+ if [ ! -f "./doc" ]; then
+ echo "Couldn't find docs, run:"
+ echo "# cmake -DENABLE_CLDOCS:BOOLEAN=TRUE ."
+ echo "# make doc"
+ echo "and then try again"
+ exit 1
+ fi
+
INLINES=0
grep -c "\[inline" doc/html/*.html|grep -v ":0$"|grep -v "util"|grep -v "jstreams" | while read line; do
@@ -195,7 +198,7 @@
continue;
fi
- if [ $INLINES == 0 ]; then
+ if [ $INLINES -eq 0 ]; then
echo "These files report inline code:"
INLINES=1
FAIL=1
@@ -204,16 +207,16 @@
done
fi
-if [ $t_compile == 1 ]; then
+if [ $t_compile -eq 1 ]; then
#compile serperately
make cl_test
- if [ $? != 0 ]; then
+ if [ $? -ne 0 ]; then
FAIL=1;
fi
#compile together
make test-all
- if [ $? != 0 ]; then
+ if [ $? -ne 0 ]; then
FAIL=1;
fi
fi
Modified: branches/lucene2_3_2/src/contribs/contribs-lib-test/TestSnowball.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/contribs-lib-test/TestSnowball.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs/contribs-lib-test/TestSnowball.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -10,14 +10,14 @@
TokenStream* ts = an.tokenStream(_T("test"), &reader);
Token t;
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t)!=NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("he")) == 0);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t)!=NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("abhor")) == 0);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t)!=NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("accent")) == 0);
- CLUCENE_ASSERT(ts->next(&t) == false);
+ CLUCENE_ASSERT(ts->next(&t) == NULL);
_CLDELETE(ts);
}
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -21,7 +21,7 @@
ignoreSurrogates = true;
}
-bool CJKTokenizer::next(Token* token){
+CL_NS(analysis)::Token* CJKTokenizer::next(Token* token){
/** how many character(s) has been stored in buffer */
int32_t length = 0;
@@ -31,7 +31,7 @@
while (true) {
/** current character */
clunichar c;
- int charlen = 1;
+ int charlen = 1;
offset++;
@@ -49,7 +49,7 @@
break;
} else {
- return false;
+ return NULL;
}
} else {
//get current character
@@ -178,7 +178,7 @@
buffer[length]='\0';
token->set(buffer,start, start+length, tokenType);
- return true;
+ return token;
}
CL_NS_END2
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -91,7 +91,7 @@
* hanppened in the InputStream
*
*/
- bool next(CL_NS(analysis)::Token* token);
+ CL_NS(analysis)::Token* next(CL_NS(analysis)::Token* token);
bool getIgnoreSurrogates(){ return ignoreSurrogates; };
void setIgnoreSurrogates(bool ignoreSurrogates){ this->ignoreSurrogates = ignoreSurrogates; };
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -233,7 +233,7 @@
substringBuffer[endOffset-startOffset]=_T('\0');
TCHAR* encoded = _encoder->encodeText(substringBuffer);
- const TCHAR* markedUpText=_formatter->highlightTerm(encoded, tokenGroup);
+ TCHAR* markedUpText=_formatter->highlightTerm(encoded, tokenGroup);
_CLDELETE_CARRAY(encoded);
//store any whitespace etc from between this and last group
@@ -291,7 +291,7 @@
substringBuffer[endOffset-startOffset]=_T('\0');
TCHAR* encoded = _encoder->encodeText(substringBuffer);
- const TCHAR* markedUpText=_formatter->highlightTerm(encoded, tokenGroup);
+ TCHAR* markedUpText=_formatter->highlightTerm(encoded, tokenGroup);
_CLDELETE_CARRAY(encoded);
//store any whitespace etc from between this and last group
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -91,7 +91,7 @@
return 0;
}
//found a query term - is it unique in this doc?
- if(_uniqueTermsInFragment.find(termText)==_uniqueTermsInFragment.end())
+ if(_uniqueTermsInFragment.find((TCHAR*)termText)==_uniqueTermsInFragment.end())
{
_totalScore+=queryTerm->getWeight();
TCHAR* owned_term = stringDuplicate(termText);
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryScorer.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -43,7 +43,7 @@
{
private:
TextFragment * _currentTextFragment;
- CL_NS(util)::CLHashSet<const TCHAR*,
+ CL_NS(util)::CLHashSet<TCHAR*,
CL_NS(util)::Compare::TChar,
CL_NS(util)::Deletor::tcArray> _uniqueTermsInFragment;
float_t _totalScore;
@@ -51,7 +51,7 @@
CL_NS(util)::CLHashMap<const TCHAR*, const WeightedTerm *,
CL_NS(util)::Compare::TChar,
CL_NS(util)::Equals::TChar,
- CL_NS(util)::Deletor::tcArray,
+ CL_NS(util)::Deletor::Dummy,
CL_NS(util)::Deletor::Object<const WeightedTerm> > _termsToFind;
public:
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/SimpleHTMLFormatter.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/SimpleHTMLFormatter.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/SimpleHTMLFormatter.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -29,8 +29,8 @@
class CLUCENE_CONTRIBS_EXPORT SimpleHTMLFormatter :public Formatter
{
private:
- const TCHAR* _preTag;
- const TCHAR* _postTag;
+ TCHAR* _preTag;
+ TCHAR* _postTag;
public:
~SimpleHTMLFormatter();
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenGroup.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenGroup.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenGroup.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -26,11 +26,12 @@
numTokens=0;
startOffset=0;
endOffset=0;
- tokens = _CL_NEWARRAY(Token, MAX_NUM_TOKENS_PER_GROUP);
+ tokens = new Token[MAX_NUM_TOKENS_PER_GROUP];
}
TokenGroup::~TokenGroup(void)
{
+ delete[] tokens;
}
void TokenGroup::addToken(Token* token, float_t score)
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -17,7 +17,7 @@
#include "CLucene/_ApiHeader.h"
#include "TokenSources.h"
-#include "CLucene/util/VoidList.h"
+#include "CLucene/util/VoidList.h"
#include "CLucene/util/CLStreams.h"
#include "CLucene/index/IndexReader.h"
#include "CLucene/index/TermVector.h"
@@ -108,7 +108,7 @@
CLSetList<Token*,TokenOrderCompare>* unsortedTokens = NULL;
for (int32_t t = 0; t < freq->length; t++)
{
- ObjectArray<TermVectorOffsetInfo>* offsets=tpv->getOffsets(t);
+ ArrayBase<TermVectorOffsetInfo*>* offsets=tpv->getOffsets(t);
if(offsets==NULL)
return NULL;
@@ -211,16 +211,16 @@
this->tokens=tokens;
this->length = len;
}
-bool TokenSources::StoredTokenStream::next(CL_NS(analysis)::Token* token)
+CL_NS(analysis)::Token* TokenSources::StoredTokenStream::next(CL_NS(analysis)::Token* token)
{
if(currentToken>=length)
{
- return false;
+ return NULL;
}
Token* t = tokens[currentToken++];
token->set(t->termBuffer(),t->startOffset(),t->endOffset(),t->type());;
- return true;
+ return token;
}
void TokenSources::StoredTokenStream::close(){
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -26,7 +26,7 @@
size_t length;
int32_t currentToken;
StoredTokenStream(CL_NS(analysis)::Token** tokens, size_t len);
- bool next(CL_NS(analysis)::Token* token);
+ CL_NS(analysis)::Token* next(CL_NS(analysis)::Token* token);
void close();
};
public:
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -30,7 +30,7 @@
SnowballAnalyzer::SnowballAnalyzer(const TCHAR* language, const TCHAR** stopWords) {
this->language = STRDUP_TtoT(language);
- stopSet = _CLNEW CLTCSetList;
+ stopSet = _CLNEW CLTCSetList(true);
StopFilter::fillStopTable(stopSet,stopWords);
}
@@ -89,9 +89,9 @@
}
/** Returns the next input Token, after being stemmed */
- bool SnowballFilter::next(Token* token){
- if (!input->next(token))
- return false;
+ Token* SnowballFilter::next(Token* token){
+ if (input->next(token) == NULL)
+ return NULL;
unsigned char uctext[LUCENE_MAX_WORD_LEN];
TCHAR tchartext[LUCENE_MAX_WORD_LEN];
@@ -124,7 +124,7 @@
tchartext[i]=stemmed[i];
#endif
token->set(tchartext,token->startOffset(), token->endOffset(), token->type());
- return true;
+ return token;
}
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -14,7 +14,7 @@
* {@link EnglishStemmer} is named "English".
*/
class CLUCENE_CONTRIBS_EXPORT SnowballAnalyzer: public Analyzer {
- const TCHAR* language;
+ TCHAR* language;
CLTCSetList* stopSet;
public:
Modified: branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballFilter.h
===================================================================
--- branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballFilter.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballFilter.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -28,7 +28,7 @@
~SnowballFilter();
/** Returns the next input Token, after being stemmed */
- bool next(Token* token);
+ Token* next(Token* token);
};
CL_NS_END2
Modified: branches/lucene2_3_2/src/core/CLucene/CLConfig.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/CLConfig.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/core/CLucene/CLConfig.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -18,7 +18,7 @@
//
//define this if you want condition debugging to be enabled
#if defined(_DEBUG) && !defined(_CL__CND_DEBUG)
- //#define _CL__CND_DEBUG
+ #define _CL__CND_DEBUG
#endif
//
//define this to print out lots of information about merges, etc
@@ -41,12 +41,6 @@
// Your application
////////////////////////////////////////////////////////////////////
//
-//define this to force the build into ascii mode
-//#define _ASCII
-//
-//define this to force the build into ucs2 mode
-//#define _UCS2
-//
//define this to enable mmap support in the fsdirectory IndexInput
//EXPERIMENTAL
//#define LUCENE_FS_MMAP
@@ -112,40 +106,14 @@
// application
////////////////////////////////////////////////////////////////////
//
-//define this to your own setting if you would like to implement your own
-//threading locking code. it should have the same sort of functions as
-//mutex_default. If not defined, clucene will try and use posix,win32 critical
-//sections, or a timer based mutex hack.
-//#define _LUCENE_THREADMUTEX CL_NS(util)::mutex_default
-//
//define this if you want to implement the _Cnd_OutDebug routine yourself
//you can then easily customise in your own application how to handle debug messages
//#define _CND_DEBUG_DONTIMPLEMENT_OUTDEBUG
//
-//define this if you want to implement your own namespace macros
-//#define _LUCENE_DONTIMPLEMENT_NS_MACROS
-//
-//define this if you do not want clucene to include any standard libraries.
-//this could be useful if you want to use alternate libraries
-//#define LUCENE_DISABLE_INCLUDES
-//
////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////
-// These options will be changed depending on your compiler/platform
-// but can also be changed here if required
-////////////////////////////////////////////////////////////////////
-//
-//if you want to define your own default file encoding. specify it
-//here - normally defined in the platform specific headers
-//#define PLATFORM_DEFAULT_READER_ENCODING CL_NS(util)::FileReader::ENCODING_ASCII
-//
-////////////////////////////////////////////////////////////////////
-
-
-
-////////////////////////////////////////////////////////////////////
// These options should not be changed. But you can experiment with
// them to optimize performance
////////////////////////////////////////////////////////////////////
@@ -190,13 +158,6 @@
#define LUCENE_DEFAULT_TOKEN_BUFFER_SIZE 32
//todo: should implement a similar strategy in analysis/token
//
-//Expert: The fraction of {@link TermDocs} entries stored in skip tables,
-//used to accellerate {@link TermDocs#skipTo(int)}. Larger values result in
-//smaller indices, greater acceleration, but fewer accelerable cases, while
-//smaller values result in bigger indices, less acceleration and more
-//accelerable cases. More detailed experiments would be useful here. */
-#define LUCENE_DEFAULT_TERMDOCS_SKIP_INTERVAL 16
-//
//Size of TermScore cache. Required.
#define LUCENE_SCORE_CACHE_SIZE 32
//
@@ -239,9 +200,6 @@
//Size of the CharTokenizer buffersize. Required.
#define LUCENE_IO_BUFFER_SIZE 1024
//
-//the minimum amount the segment term enum should grow by. Must be at least 1
-#define LUCENE_SEGMENTTERMENUM_GROWSIZE 8
-//
////////////////////////////////////////////////////////////////////
#endif
Modified: branches/lucene2_3_2/src/core/CLucene/CLMonolithic.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/CLMonolithic.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/core/CLucene/CLMonolithic.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -1,13 +1,13 @@
/*------------------------------------------------------------------------------
* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
-*
-* Distributable under the terms of either the Apache License (Version 2.0) or
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
------------------------------------------------------------------------------*/
/*
* this is a monolithic file that can be used to compile clucene using one source file.
* it simplifies some build processes by avoiding static & dynamic compalation pitfalls.
-*
+*
* note: when creating a project add either this file, or all the other .cpp files, not both!
*/
#include "CLucene/StdHeader.cpp"
@@ -20,17 +20,27 @@
#include "CLucene/document/DateField.cpp"
#include "CLucene/document/DateTools.cpp"
#include "CLucene/document/Document.cpp"
+#include "CLucene/document/FieldSelector.cpp"
#include "CLucene/document/NumberTools.cpp"
#include "CLucene/document/Field.cpp"
#include "CLucene/index/CompoundFile.cpp"
-#include "CLucene/index/DocumentWriter.cpp"
+#include "CLucene/index/DirectoryIndexReader.cpp"
+#include "CLucene/index/DocumentsWriter.cpp"
+#include "CLucene/index/DocumentsWriterThreadState.cpp"
#include "CLucene/index/FieldInfos.cpp"
#include "CLucene/index/FieldsReader.cpp"
#include "CLucene/index/FieldsWriter.cpp"
+#include "CLucene/index/IndexFileDeleter.cpp"
+#include "CLucene/index/IndexFileNameFilter.cpp"
#include "CLucene/index/IndexFileNames.cpp"
+#include "CLucene/index/IndexModifier.cpp"
#include "CLucene/index/IndexWriter.cpp"
#include "CLucene/index/IndexReader.cpp"
+#include "CLucene/index/MergePolicy.cpp"
+#include "CLucene/index/MergeScheduler.cpp"
#include "CLucene/index/MultiReader.cpp"
+#include "CLucene/index/MultiSegmentReader.cpp"
+#include "CLucene/index/Payload.cpp"
#include "CLucene/index/SegmentInfos.cpp"
#include "CLucene/index/SegmentMergeInfo.cpp"
#include "CLucene/index/SegmentMergeQueue.cpp"
@@ -40,6 +50,8 @@
#include "CLucene/index/SegmentTermEnum.cpp"
#include "CLucene/index/SegmentTermPositions.cpp"
#include "CLucene/index/SegmentTermVector.cpp"
+#include "CLucene/index/SkipListReader.cpp"
+#include "CLucene/index/SkipListWriter.cpp"
#include "CLucene/index/Term.cpp"
#include "CLucene/index/Terms.cpp"
#include "CLucene/index/TermInfo.cpp"
@@ -47,12 +59,11 @@
#include "CLucene/index/TermInfosWriter.cpp"
#include "CLucene/index/TermVectorReader.cpp"
#include "CLucene/index/TermVectorWriter.cpp"
-#include "CLucene/queryParser/Lexer.cpp"
+#include "CLucene/queryParser/FastCharStream.cpp"
+#include "CLucene/queryParser/QueryParserTokenManager.cpp"
#include "CLucene/queryParser/MultiFieldQueryParser.cpp"
#include "CLucene/queryParser/QueryParser.cpp"
-#include "CLucene/queryParser/QueryParserBase.cpp"
#include "CLucene/queryParser/QueryToken.cpp"
-#include "CLucene/queryParser/TokenList.cpp"
#include "CLucene/search/BooleanQuery.cpp"
#include "CLucene/search/BooleanScorer.cpp"
#include "CLucene/search/BooleanScorer2.cpp"
@@ -73,6 +84,7 @@
#include "CLucene/search/Hits.cpp"
#include "CLucene/search/HitQueue.cpp"
#include "CLucene/search/IndexSearcher.cpp"
+#include "CLucene/search/MatchAllDocsQuery.cpp"
#include "CLucene/search/MultiSearcher.cpp"
#include "CLucene/search/MultiTermQuery.cpp"
#include "CLucene/search/PhrasePositions.cpp"
@@ -100,7 +112,7 @@
#include "CLucene/store/IndexOutput.cpp"
#include "CLucene/store/Directory.cpp"
#include "CLucene/store/RAMDirectory.cpp"
-#include "CLucene/store/TransactionalRAMDirectory.cpp"
+//#include "CLucene/store/TransactionalRAMDirectory.cpp"
#include "CLucene/util/BitSet.cpp"
#include "CLucene/util/Equators.cpp"
#include "CLucene/util/FastCharStream.cpp"
Modified: branches/lucene2_3_2/src/core/CLucene/StdHeader.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/StdHeader.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/core/CLucene/StdHeader.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -10,6 +10,8 @@
#include "CLucene/search/Sort.h"
#include "CLucene/search/Similarity.h"
#include "CLucene/search/FieldCache.h"
+#include "CLucene/index/TermVector.h"
+#include "CLucene/index/IndexFileNameFilter.h"
#include "CLucene/search/FieldSortedHitQueue.h"
#include "CLucene/store/LockFactory.h"
#include "CLucene/util/_StringIntern.h"
@@ -22,20 +24,21 @@
CL_NS_USE(util)
CL_NS_USE(search)
+CL_NS_USE(index)
CL_NS_USE(store)
//clears all static memory. do not attempt to do anything else
//in clucene after calling this function
void _lucene_shutdown(){
- FieldSortedHitQueue::_shutdown();
- Sort::_shutdown();
- ScoreDocComparator::_shutdown();
- SortField::_shutdown();
- FieldCache::_shutdown();
- Similarity::_shutdown();
-
- CLStringIntern::_shutdown();
- NoLockFactory::_shutdown();
-
-_ThreadLocal::_shutdown();
+ FieldSortedHitQueue::_shutdown();
+ Sort::_shutdown();
+ ScoreDocComparator::_shutdown();
+ SortField::_shutdown();
+ FieldCache::_shutdown();
+ Similarity::_shutdown();
+ CLStringIntern::_shutdown();
+ NoLockFactory::_shutdown();
+ _ThreadLocal::_shutdown();
+ IndexFileNameFilter::_shutdown();
+ _CLDELETE (TermVectorOffsetInfo_EMPTY_OFFSET_INFO);
}
Modified: branches/lucene2_3_2/src/core/CLucene/StdHeader.h
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/StdHeader.h 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/core/CLucene/StdHeader.h 2009-06-11 17:34:23 UTC (rev 3009)
@@ -27,12 +27,12 @@
#define StringArray std::vector<TCHAR*>
#define StringArrayWithDeletor CL_NS(util)::CLVector<TCHAR*, CL_NS(util)::Deletor::tcArray >
#define StringArrayConst std::vector<const TCHAR*>
-#define StringArrayConstWithDeletor CL_NS(util)::CLVector<const TCHAR*, CL_NS(util)::Deletor::tcArray >
+//#define StringArrayConstWithDeletor CL_NS(util)::CLVector<const TCHAR*, CL_NS(util)::Deletor::tcArray >
#define AStringArray std::vector<char*>
#define AStringArrayWithDeletor CL_NS(util)::CLVector<char*, CL_NS(util)::Deletor::acArray >
#define AStringArrayConst std::vector<const char*>
-#define AStringArrayConstWithDeletor CL_NS(util)::CLVector<const char*, CL_NS(util)::Deletor::acArray >
+//#define AStringArrayConstWithDeletor CL_NS(util)::CLVector<const char*, CL_NS(util)::Deletor::acArray >
//call this at the end of running to clean up memory.
extern CLUCENE_EXPORT void _lucene_shutdown();
Modified: branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.cpp
===================================================================
--- branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.cpp 2009-06-11 16:19:00 UTC (rev 3008)
+++ branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.cpp 2009-06-11 17:34:23 UTC (rev 3009)
@@ -1,13 +1,14 @@
/*------------------------------------------------------------------------------
* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
-*
-* Distributable under the terms of either the Apache License (Version 2.0) or
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
* the GNU Lesser General Public License, as specified in the COPYING file.
------------------------------------------------------------------------------*/
#include "CLucene/_ApiHeader.h"
#include "AnalysisHeader.h"
#include "CLucene/util/StringBuffer.h"
#include "CLucene/util/_ThreadLocal.h"
+#include <assert.h>
CL_NS_USE(util)
...
[truncated message content] |
