You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ar...@apache.org on 2008/07/15 23:44:10 UTC
svn commit: r677059 [1/19] - in /incubator/lucene.net/trunk/C#/src: ./
Demo/DeleteFiles/ Demo/DemoLib/ Demo/IndexFiles/ Demo/IndexHtml/
Demo/SearchFiles/ Lucene.Net/ Lucene.Net/Analysis/ Lucene.Net/Index/
Lucene.Net/Search/ Lucene.Net/Search/Function/ ...
Author: aroush
Date: Tue Jul 15 14:44:04 2008
New Revision: 677059
URL: http://svn.apache.org/viewvc?rev=677059&view=rev
Log:
Lucene.Net 2.3.1 build 002 "beta" release
1) Port of Test code
2) Some fixes to Lucene.Net core code
Added:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.3.1.ndoc (props changed)
- copied unchanged from r676684, incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.ndoc
incubator/lucene.net/trunk/C#/src/Test/Analysis/TeeSinkTokenTest.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestCachingTokenFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestCharArraySet.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestToken.cs
incubator/lucene.net/trunk/C#/src/Test/App.config
incubator/lucene.net/trunk/C#/src/Test/Index/DocTest.cs
incubator/lucene.net/trunk/C#/src/Test/Index/MockInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Index/Store/FSDirectoryTestCase.cs
incubator/lucene.net/trunk/C#/src/Test/Index/Store/TestFSDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/Index/Store/_delete_TestFSDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TermInfosTest.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestAtomicUpdate.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestCheckIndex.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestConcurrentMergeScheduler.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestDeletionPolicy.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReaderReopen.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestMultiLevelSkipList.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestMultiSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestPayloads.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestPositionBasedTermVectorMapper.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing2.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTerm.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestThreadedOptimize.cs
incubator/lucene.net/trunk/C#/src/Test/Index/index.presharedstores.cfs.zip (with props)
incubator/lucene.net/trunk/C#/src/Test/Index/index.presharedstores.nocfs.zip (with props)
incubator/lucene.net/trunk/C#/src/Test/Search/CachingWrapperFilterHelper.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Function/
incubator/lucene.net/trunk/C#/src/Test/Search/Function/FunctionTestSetup.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestCustomScoreQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestFieldScoreQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Function/TestOrdValues.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/
incubator/lucene.net/trunk/C#/src/Test/Search/Payloads/TestBoostingTermQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/RemoteCachingWrapperFilterHelper.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestDateSort.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestExtendedFieldCache.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRemoteCachingWrapperFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSearchHitsWithDeletions.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSpanQueryFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Store/MockRAMInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestHugeRamFile.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestMMapDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/TestSnapshotDeletionPolicy.cs
incubator/lucene.net/trunk/C#/src/Test/Util/LuceneTestCase.cs
incubator/lucene.net/trunk/C#/src/Test/Util/StringHelperTest.cs
Removed:
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.0.0.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0-VS2005.sln
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.csproj
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.ndoc
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.1.0.sln
Modified:
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/HISTORY.txt
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharArraySet.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordTokenizer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CheckIndex.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MergePolicy.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ParallelReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermDocs.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermEnum.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositions.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorEntryFreqSortedComparator.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.sln
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/DocValues.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/FloatFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/IntFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/OrdFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ReverseOrdFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ShortFieldSource.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ValueSourceQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMInputStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestAnalyzers.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestISOLatin1AccentFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestLengthFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestPerFieldAnalzyerWrapper.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStandardAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopFilter.cs
incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Test/Document/TestBinaryDocument.cs
incubator/lucene.net/trunk/C#/src/Test/Document/TestDateTools.cs
incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs
incubator/lucene.net/trunk/C#/src/Test/Document/TestNumberTools.cs
incubator/lucene.net/trunk/C#/src/Test/Index/DocHelper.cs
incubator/lucene.net/trunk/C#/src/Test/Index/MockIndexInput.cs
incubator/lucene.net/trunk/C#/src/Test/Index/Store/TestRAMDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestAddIndexesNoOptimize.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestBackwardsCompatibility.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestCompoundFile.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestDoc.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestDocumentWriter.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestFieldInfos.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestFieldsReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestFilterIndexReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexFileDeleter.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexInput.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexModifier.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriter.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterDelete.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterLockRelease.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterMergePolicy.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexWriterMerging.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyBug.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestMultiReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestNorms.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelTermEnum.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestSegmentMerger.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestSegmentReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestSegmentTermDocs.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestSegmentTermEnum.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermVectorsReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermVectorsWriter.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermdocPerf.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestWordlistLoader.cs
incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestMultiFieldQueryParser.cs
incubator/lucene.net/trunk/C#/src/Test/QueryParser/TestQueryParser.cs
incubator/lucene.net/trunk/C#/src/Test/Search/BaseTestRangeFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/CheckHits.cs
incubator/lucene.net/trunk/C#/src/Test/Search/MockFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/QueryUtils.cs
incubator/lucene.net/trunk/C#/src/Test/Search/SampleComparable.cs
incubator/lucene.net/trunk/C#/src/Test/Search/SingleDocTestFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestBasics.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestNearSpansOrdered.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpanExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpanExplanationsOfNonMatches.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpans.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced.cs
incubator/lucene.net/trunk/C#/src/Test/Search/Spans/TestSpansAdvanced2.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBoolean2.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanMinShouldMatch.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanOr.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanPrefixQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestBooleanScorer.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestCachingWrapperFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestComplexExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestComplexExplanationsOfNonMatches.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestConstantScoreRangeQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestCustomSearcherSort.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestDateFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestDisjunctionMaxQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestDocBoost.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestFilteredQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestFuzzyQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestMatchAllDocsQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiPhraseQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiSearcher.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiSearcherRanking.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestMultiThreadTermVectors.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestNot.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestParallelMultiSearcher.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPhrasePrefixQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPhraseQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPositionIncrement.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestQueryTermVector.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRangeFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRangeQuery.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestRemoteSearchable.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestScorerPerf.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSetNorm.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSimilarity.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSimpleExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSimpleExplanationsOfNonMatches.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestTermScorer.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestThreadSafe.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestWildcard.cs
incubator/lucene.net/trunk/C#/src/Test/SearchTest.cs
incubator/lucene.net/trunk/C#/src/Test/Store/MockRAMDirectory.cs
incubator/lucene.net/trunk/C#/src/Test/Store/MockRAMOutputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestBufferedIndexInput.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestLock.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestLockFactory.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestWindowsMMap.cs
incubator/lucene.net/trunk/C#/src/Test/Store/_TestHelper.cs
incubator/lucene.net/trunk/C#/src/Test/StoreTest.cs
incubator/lucene.net/trunk/C#/src/Test/Test-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Test/Test.csproj
incubator/lucene.net/trunk/C#/src/Test/Test.sln
incubator/lucene.net/trunk/C#/src/Test/TestDemo.cs
incubator/lucene.net/trunk/C#/src/Test/TestHitIterator.cs
incubator/lucene.net/trunk/C#/src/Test/TestSearch.cs
incubator/lucene.net/trunk/C#/src/Test/TestSearchForDuplicates.cs
incubator/lucene.net/trunk/C#/src/Test/ThreadSafetyTest.cs
incubator/lucene.net/trunk/C#/src/Test/Util/TestBitVector.cs
incubator/lucene.net/trunk/C#/src/Test/Util/TestPriorityQueue.cs
incubator/lucene.net/trunk/C#/src/Test/Util/TestSmallFloat.cs
incubator/lucene.net/trunk/C#/src/Test/Util/TestStringHelper.cs
incubator/lucene.net/trunk/C#/src/Test/Util/_TestUtil.cs
Modified: incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DeleteFiles/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -28,8 +28,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.DeleteFile")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.001")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -28,8 +28,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.DemoLib")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.001")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexFiles/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -28,8 +28,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.IndexFiles")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.001")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexHtml/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -28,8 +28,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.IndexHtml")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.001")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/SearchFiles/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -28,8 +28,8 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.SearchFiles")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.001")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/HISTORY.txt
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/HISTORY.txt?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/HISTORY.txt (original)
+++ incubator/lucene.net/trunk/C#/src/HISTORY.txt Tue Jul 15 14:44:04 2008
@@ -2,9 +2,16 @@
-------------------------
+15JJul08:
+ - Release: Apache Lucene.Net.2.3.1 build 002 "Beta"
+ - Port: Prted the "Test" code from Java to C#.
+ - Fix: A number of issues in Lucene.Net Core code -- Thanks to Doug Sale
+ - Fix: A number of issues in Lucene.Net Test code -- Thanks to Doug Sale
+
+
24Jun08:
- Dev Release: Apache Lucene.Net.2.3.1 build 001 "Alpha"
- - Port: Prted teh "Core" and "Demo" code from Java to C#.
+ - Port: Prted the "Core" and "Demo" code from Java to C#.
- Issues: Test code is not released yet.
- Note: Requires Visual Studio 2005 or later and .NET 2.0 or later.
- Note: There is no 2.3.0 or 2.2 release (to correspond with the Java Lucene release).
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharArraySet.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/CharArraySet.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharArraySet.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharArraySet.cs Tue Jul 15 14:44:04 2008
@@ -32,6 +32,13 @@
public class CharArraySet : System.Collections.Hashtable
{
+ public override int Count
+ {
+ get
+ {
+ return count;
+ }
+ }
private const int INIT_SIZE = 8;
private char[][] entries;
@@ -68,13 +75,6 @@
return entries[GetSlot(text, off, len)] != null;
}
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // /// <summary>true if the <code>CharSequence</code> is in the set </summary>
- // public virtual bool Contains(CharSequence cs)
- // {
- // return entries[GetSlot(cs)] != null;
- // }
-
private int GetSlot(char[] text, int off, int len)
{
int code = GetHashCode(text, off, len);
@@ -94,34 +94,6 @@
return pos;
}
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // /// <summary>Returns true if the String is in the set </summary>
- // private int GetSlot(CharSequence text)
- // {
- // int code = GetHashCode(text);
- // int pos = code & (entries.Length - 1);
- // char[] text2 = entries[pos];
- // if (text2 != null && !Equals(text, text2))
- // {
- // int inc = ((code >> 8) + code) | 1;
- // do
- // {
- // code += inc;
- // pos = code & (entries.Length - 1);
- // text2 = entries[pos];
- // }
- // while (text2 != null && !Equals(text, text2));
- // }
- // return pos;
- // }
-
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // /// <summary>Add this CharSequence into the set </summary>
- // public virtual bool Add(CharSequence text)
- // {
- // return Add(text.toString()); // could be more efficient
- // }
-
/// <summary>Add this String into the set </summary>
public virtual bool Add(System.String text)
{
@@ -174,31 +146,6 @@
return true;
}
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // private bool Equals(CharSequence text1, char[] text2)
- // {
- // int len = text1.length();
- // if (len != text2.Length)
- // return false;
- // if (ignoreCase)
- // {
- // for (int i = 0; i < len; i++)
- // {
- // if (Character.toLowerCase(text1.charAt(i)) != text2[i])
- // return false;
- // }
- // }
- // else
- // {
- // for (int i = 0; i < len; i++)
- // {
- // if (text1.charAt(i) != text2[i])
- // return false;
- // }
- // }
- // return true;
- // }
-
private void Rehash()
{
int newSize = 2 * entries.Length;
@@ -237,38 +184,6 @@
return code;
}
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // private int GetHashCode(CharSequence text)
- // {
- // int code;
- // if (ignoreCase)
- // {
- // code = 0;
- // int len = text.length();
- // for (int i = 0; i < len; i++)
- // {
- // code = code * 31 + Character.toLowerCase(text.charAt(i));
- // }
- // }
- // else
- // {
- // if (false && text is System.String)
- // {
- // code = text.hashCode();
- // }
- // else
- // {
- // code = 0;
- // int len = text.length();
- // for (int i = 0; i < len; i++)
- // {
- // code = code * 31 + text.charAt(i);
- // }
- // }
- // }
- // return code;
- // }
-
public virtual int Size()
{
return count;
@@ -288,13 +203,9 @@
}
else if (o is String)
{
- return Contains((String) o);
- }
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // else if (o is CharSequence)
- // {
- // return Contains((CharSequence) o);
- // }
+ String s = (String)o;
+ return Contains(s.ToCharArray(), 0, s.Length);
+ }
return false;
}
@@ -308,11 +219,6 @@
{
return Add((System.String) o);
}
- // {{Doug-2.3.1}}: commented to determine if used internally to library
- // else if (o is CharSequence)
- // {
- // return Add((CharSequence) o);
- // }
else
{
return Add(o.ToString());
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/CharTokenizer.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharTokenizer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/CharTokenizer.cs Tue Jul 15 14:44:04 2008
@@ -61,7 +61,7 @@
{
offset += dataLen;
dataLen = input is Lucene.Net.Index.DocumentsWriter.ReusableStringReader ? ((Lucene.Net.Index.DocumentsWriter.ReusableStringReader) input).Read(ioBuffer) : input.Read((System.Char[]) ioBuffer, 0, ioBuffer.Length);
- if (dataLen == -1)
+ if (dataLen <= 0)
{
if (length > 0)
break;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/KeywordTokenizer.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordTokenizer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/KeywordTokenizer.cs Tue Jul 15 14:44:04 2008
@@ -48,7 +48,7 @@
while (true)
{
int length = input.Read(buffer, upto, buffer.Length - upto);
- if (length == -1)
+ if (length <= 0)
break;
upto += length;
if (upto == buffer.Length)
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/AssemblyInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs Tue Jul 15 14:44:04 2008
@@ -24,16 +24,16 @@
// associated with an assembly.
//
[assembly: AssemblyTitle("Apache Lucene.Net")]
-[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net full-text search library")]
+[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net a full-text search engine library")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net")]
-[assembly: AssemblyCopyright("Copyright 2007 The Apache Software Foundation")]
-[assembly: AssemblyTrademark("Copyright 2007 The Apache Software Foundation")]
+[assembly: AssemblyCopyright("Copyright 2006 - 2008 The Apache Software Foundation")]
+[assembly: AssemblyTrademark("Copyright 2006 - 2008 The Apache Software Foundation")]
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.1")]
+[assembly: AssemblyInformationalVersionAttribute("2.3.1")]
//
@@ -47,7 +47,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.0.003")]
+[assembly: AssemblyVersion("2.3.1.002")]
//
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CheckIndex.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/CheckIndex.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CheckIndex.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/CheckIndex.cs Tue Jul 15 14:44:04 2008
@@ -179,8 +179,8 @@
out_Renamed.WriteLine("OK");
out_Renamed.Write(" test: fields, norms.......");
- System.Collections.ICollection fieldNames = reader.GetFieldNames(IndexReader.FieldOption.ALL);
- System.Collections.IEnumerator it = fieldNames.GetEnumerator();
+ System.Collections.IDictionary fieldNames = (System.Collections.IDictionary) reader.GetFieldNames(IndexReader.FieldOption.ALL);
+ System.Collections.IEnumerator it = fieldNames.Keys.GetEnumerator();
while (it.MoveNext())
{
System.String fieldName = (System.String) it.Current;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs Tue Jul 15 14:44:04 2008
@@ -432,5 +432,15 @@
{
allInstances = new System.Collections.ArrayList();
}
+
+ public void SetSuppressExceptions_ForNUnitTest()
+ {
+ SetSuppressExceptions();
+ }
+
+ public void ClearSuppressExceptions_ForNUnitTest()
+ {
+ ClearSuppressExceptions();
+ }
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/FieldInfo.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs Tue Jul 15 14:44:04 2008
@@ -58,9 +58,15 @@
}
// For testing only
- public System.String Name
+ public System.String Name_ForNUnitTest
{
get { return name; }
}
- }
+
+ // For testing only
+ public bool StorePayloads_ForNUnitTest
+ {
+ get { return storePayloads; }
+ }
+ }
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/FieldsReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldsReader.cs Tue Jul 15 14:44:04 2008
@@ -56,7 +56,7 @@
private System.LocalDataStoreSlot fieldsStreamTL = System.Threading.Thread.AllocateDataSlot();
- internal FieldsReader(Directory d, System.String segment, FieldInfos fn) : this(d, segment, fn, BufferedIndexInput.BUFFER_SIZE, - 1, 0)
+ public FieldsReader(Directory d, System.String segment, FieldInfos fn) : this(d, segment, fn, BufferedIndexInput.BUFFER_SIZE, - 1, 0)
{
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexFileNames.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs Tue Jul 15 14:44:04 2008
@@ -27,14 +27,14 @@
/// </author>
/// <version> $rcs = ' $Id: Exp $ ' ;
/// </version>
- sealed class IndexFileNames
+ public sealed class IndexFileNames
{
/// <summary>Name of the index segment file </summary>
- internal const System.String SEGMENTS = "segments";
+ public /*internal*/ const System.String SEGMENTS = "segments";
/// <summary>Name of the generation reference file name </summary>
- internal const System.String SEGMENTS_GEN = "segments.gen";
+ public /*internal*/ const System.String SEGMENTS_GEN = "segments.gen";
/// <summary>Name of the index deletable file (only used in
/// pre-lockless indices)
@@ -66,10 +66,10 @@
internal const System.String VECTORS_FIELDS_EXTENSION = "tvf";
/// <summary>Extension of vectors documents file </summary>
- internal const System.String VECTORS_DOCUMENTS_EXTENSION = "tvd";
+ public /*internal*/ const System.String VECTORS_DOCUMENTS_EXTENSION = "tvd";
/// <summary>Extension of vectors index file </summary>
- internal const System.String VECTORS_INDEX_EXTENSION = "tvx";
+ public /*internal*/ const System.String VECTORS_INDEX_EXTENSION = "tvx";
/// <summary>Extension of compound file </summary>
internal const System.String COMPOUND_FILE_EXTENSION = "cfs";
@@ -81,7 +81,7 @@
internal const System.String DELETES_EXTENSION = "del";
/// <summary>Extension of field infos </summary>
- internal const System.String FIELD_INFOS_EXTENSION = "fnm";
+ public /*internal*/ const System.String FIELD_INFOS_EXTENSION = "fnm";
/// <summary>Extension of plain norms </summary>
internal const System.String PLAIN_NORMS_EXTENSION = "f";
@@ -128,7 +128,7 @@
/// </param>
/// <param name="gen">-- generation
/// </param>
- internal static System.String FileNameFromGeneration(System.String base_Renamed, System.String extension, long gen)
+ public /*internal*/ static System.String FileNameFromGeneration(System.String base_Renamed, System.String extension, long gen)
{
if (gen == SegmentInfo.NO)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs Tue Jul 15 14:44:04 2008
@@ -121,7 +121,7 @@
private volatile int refCount;
// for testing
- internal virtual int GetRefCount()
+ public /*internal*/ virtual int GetRefCount()
{
lock (this)
{
@@ -194,7 +194,7 @@
}
/// <throws> AlreadyClosedException if this IndexReader is closed </throws>
- protected internal void EnsureOpen()
+ public /*protected internal*/ void EnsureOpen()
{
if (refCount <= 0)
{
@@ -558,7 +558,14 @@
public static bool IndexExists(System.IO.FileInfo directory)
{
- return SegmentInfos.GetCurrentSegmentGeneration(System.IO.Directory.GetFileSystemEntries(directory.FullName)) != - 1;
+ if (System.IO.Directory.Exists(directory.FullName))
+ {
+ return SegmentInfos.GetCurrentSegmentGeneration(System.IO.Directory.GetFileSystemEntries(directory.FullName)) != -1;
+ }
+ else
+ {
+ return false;
+ }
}
/// <summary> Returns <code>true</code> if an index exists at the specified directory.
@@ -925,7 +932,7 @@
/// (transactional semantics).
/// </summary>
/// <throws> IOException if there is a low-level IO error </throws>
- protected internal void Commit()
+ public /*protected internal*/ void Commit()
{
lock (this)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexWriter.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs Tue Jul 15 14:44:04 2008
@@ -26,6 +26,7 @@
using BitVector = Lucene.Net.Util.BitVector;
using Analyzer = Lucene.Net.Analysis.Analyzer;
using Similarity = Lucene.Net.Search.Similarity;
+using System.Collections;
namespace Lucene.Net.Index
{
@@ -1682,7 +1683,7 @@
}
// for test purpose
- internal int GetSegmentCount()
+ public /*internal*/ int GetSegmentCount()
{
lock (this)
{
@@ -1691,7 +1692,7 @@
}
// for test purpose
- internal int GetNumBufferedDocuments()
+ public /*internal*/ int GetNumBufferedDocuments()
{
lock (this)
{
@@ -1700,7 +1701,7 @@
}
// for test purpose
- internal int GetDocCount(int i)
+ public /*internal*/ int GetDocCount(int i)
{
lock (this)
{
@@ -1864,7 +1865,8 @@
segmentsToOptimize = new System.Collections.Hashtable();
int numSegments = segmentInfos.Count;
for (int i = 0; i < numSegments; i++)
- segmentsToOptimize.Add(segmentInfos.Info(i), segmentInfos.Info(i));
+ if (!segmentsToOptimize.ContainsKey(segmentInfos.Info(i)))
+ segmentsToOptimize.Add(segmentInfos.Info(i), segmentInfos.Info(i));
// Now mark all pending & running merges as optimize
// merge:
@@ -1879,7 +1881,7 @@
it = runningMerges.GetEnumerator();
while (it.MoveNext())
{
- MergePolicy.OneMerge merge = (MergePolicy.OneMerge) it.Current;
+ MergePolicy.OneMerge merge = (MergePolicy.OneMerge)((DictionaryEntry)it.Current).Value;
merge.optimize = true;
merge.maxNumSegmentsOptimize = maxNumSegments;
}
@@ -1943,7 +1945,7 @@
it = runningMerges.GetEnumerator();
while (it.MoveNext())
{
- if (((MergePolicy.OneMerge) it.Current).optimize)
+ if (((MergePolicy.OneMerge) ((DictionaryEntry)it.Current).Value).optimize)
return true;
}
@@ -2017,7 +2019,7 @@
/// to retrieve the next merge requested by the
/// MergePolicy
/// </summary>
- internal virtual MergePolicy.OneMerge GetNextMerge()
+ public /*internal*/ virtual MergePolicy.OneMerge GetNextMerge()
{
lock (this)
{
@@ -2243,7 +2245,7 @@
it = runningMerges.GetEnumerator();
while (it.MoveNext())
{
- MergePolicy.OneMerge merge = (MergePolicy.OneMerge) it.Current;
+ MergePolicy.OneMerge merge = (MergePolicy.OneMerge)((DictionaryEntry)it.Current).Value;
if (infoStream != null)
Message("now abort running merge " + merge.SegString(directory));
merge.Abort();
@@ -2675,7 +2677,7 @@
/// <param name="flushDocStores">if false we are allowed to keep
/// doc stores open to share with the next segment
/// </param>
- protected internal void Flush(bool triggerMerge, bool flushDocStores)
+ public /*protected internal*/ void Flush(bool triggerMerge, bool flushDocStores)
{
EnsureOpen();
@@ -3146,7 +3148,7 @@
/// single segment.
/// </summary>
- internal void Merge(MergePolicy.OneMerge merge)
+ public /*internal*/ void Merge(MergePolicy.OneMerge merge)
{
System.Diagnostics.Debug.Assert(merge.registerDone);
@@ -3704,7 +3706,7 @@
}
// For test purposes.
- internal int GetBufferedDeleteTermsSize()
+ public /*internal*/ int GetBufferedDeleteTermsSize()
{
lock (this)
{
@@ -3713,7 +3715,7 @@
}
// For test purposes.
- internal int GetNumBufferedDeleteTerms()
+ public /*internal*/ int GetNumBufferedDeleteTerms()
{
lock (this)
{
@@ -3777,7 +3779,7 @@
}
// utility routines for tests
- internal virtual SegmentInfo NewestSegment()
+ public /*internal*/ virtual SegmentInfo NewestSegment()
{
return segmentInfos.Info(segmentInfos.Count - 1);
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MergePolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/MergePolicy.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MergePolicy.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MergePolicy.cs Tue Jul 15 14:44:04 2008
@@ -86,6 +86,12 @@
this.segments = segments;
this.useCompoundFile = useCompoundFile;
}
+
+ // added for testing
+ public SegmentInfos Segments_ForNUnitTest
+ {
+ get { return segments; }
+ }
/// <summary>Record that an exception occurred while executing
/// this merge
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiSegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/MultiSegmentReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiSegmentReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiSegmentReader.cs Tue Jul 15 14:44:04 2008
@@ -25,7 +25,7 @@
{
/// <summary> An IndexReader which reads indexes with multiple segments.</summary>
- class MultiSegmentReader : DirectoryIndexReader
+ public class MultiSegmentReader : DirectoryIndexReader
{
protected internal SegmentReader[] subReaders;
private int[] starts; // 1st docno for each segment
@@ -516,17 +516,18 @@
for (int i = 0; i < subReaders.Length; i++)
{
IndexReader reader = subReaders[i];
- System.Collections.IEnumerator names = reader.GetFieldNames(fieldNames).GetEnumerator();
+ System.Collections.IEnumerator names = ((System.Collections.IDictionary)reader.GetFieldNames(fieldNames)).Keys.GetEnumerator();
while (names.MoveNext())
{
- fieldSet.Add(names.Current, names.Current);
+ if (!fieldSet.ContainsKey(names.Current))
+ fieldSet.Add(names.Current, names.Current);
}
}
- return fieldSet.Keys;
+ return fieldSet;
}
// for testing
- internal virtual SegmentReader[] GetSubReaders()
+ public /*internal*/ virtual SegmentReader[] GetSubReaders()
{
return subReaders;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/ParallelReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ParallelReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/ParallelReader.cs Tue Jul 15 14:44:04 2008
@@ -483,7 +483,7 @@
}
// for testing
- internal virtual IndexReader[] GetSubReaders()
+ public /*internal*/ virtual IndexReader[] GetSubReaders()
{
return (IndexReader[]) readers.ToArray(typeof(IndexReader));
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentMerger.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs Tue Jul 15 14:44:04 2008
@@ -38,7 +38,7 @@
/// </seealso>
/// <seealso cref="add">
/// </seealso>
- sealed class SegmentMerger
+ public sealed class SegmentMerger
{
[Serializable]
private class AnonymousClassFieldSelector : FieldSelector
@@ -102,7 +102,7 @@
/// </param>
/// <param name="name">The name of the new segment
/// </param>
- internal SegmentMerger(Directory dir, System.String name)
+ public /*internal*/ SegmentMerger(Directory dir, System.String name)
{
InitBlock();
directory = dir;
@@ -122,7 +122,7 @@
/// <summary> Add an IndexReader to the collection of readers that are to be merged</summary>
/// <param name="reader">
/// </param>
- internal void Add(IndexReader reader)
+ public /*internal*/ void Add(IndexReader reader)
{
readers.Add(reader);
}
@@ -142,7 +142,7 @@
/// </returns>
/// <throws> CorruptIndexException if the index is corrupt </throws>
/// <throws> IOException if there is a low-level IO error </throws>
- internal int Merge()
+ public /*internal*/ int Merge()
{
return Merge(true);
}
@@ -183,7 +183,7 @@
/// Should not be called before merge().
/// </summary>
/// <throws> IOException </throws>
- internal void CloseReaders()
+ public /*internal*/ void CloseReaders()
{
for (int i = 0; i < readers.Count; i++)
{
@@ -193,7 +193,7 @@
}
}
- internal System.Collections.ArrayList CreateCompoundFile(System.String fileName)
+ public /*internal*/ System.Collections.ArrayList CreateCompoundFile(System.String fileName)
{
CompoundFileWriter cfsWriter = new CompoundFileWriter(directory, fileName, checkAbort);
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs Tue Jul 15 14:44:04 2008
@@ -55,6 +55,13 @@
internal IndexInput freqStream;
internal IndexInput proxStream;
+
+ // for testing
+ public IndexInput ProxStream_ForNUnitTest
+ {
+ get { return proxStream; }
+ set { proxStream = value; }
+ }
// optionally used for the .nrm file shared by multiple norms
private IndexInput singleNormStream;
@@ -1039,7 +1046,7 @@
}
// for testing only
- internal virtual bool NormsClosed()
+ public /*internal*/ virtual bool NormsClosed()
{
if (singleNormStream != null)
{
@@ -1058,7 +1065,7 @@
}
// for testing only
- internal virtual bool NormsClosed(System.String field)
+ public /*internal*/ virtual bool NormsClosed(System.String field)
{
Norm norm = (Norm) norms[field];
return norm.refCount == 0;
@@ -1152,7 +1159,7 @@
}
/// <summary>Returns the field infos of this segment </summary>
- internal virtual FieldInfos FieldInfos()
+ public /*internal*/ virtual FieldInfos FieldInfos()
{
return fieldInfos;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentTermDocs.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermDocs.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermDocs.cs Tue Jul 15 14:44:04 2008
@@ -44,6 +44,13 @@
private bool haveSkipped;
protected internal bool currentFieldStoresPayloads;
+
+ // for testing
+ public IndexInput FreqStream_ForNUnitTest
+ {
+ get { return freqStream; }
+ set { freqStream = value; }
+ }
public SegmentTermDocs(SegmentReader parent)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentTermEnum.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermEnum.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermEnum.cs Tue Jul 15 14:44:04 2008
@@ -187,7 +187,7 @@
}
/// <summary>Returns the previous Term enumerated. Initially null.</summary>
- internal Term Prev()
+ public /*internal*/ Term Prev()
{
return prevBuffer.ToTerm();
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentTermPositions.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositions.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentTermPositions.cs Tue Jul 15 14:44:04 2008
@@ -22,7 +22,7 @@
namespace Lucene.Net.Index
{
- sealed class SegmentTermPositions : SegmentTermDocs, TermPositions
+ public sealed class SegmentTermPositions : SegmentTermDocs, TermPositions
{
private IndexInput proxStream;
private int proxCount;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorEntryFreqSortedComparator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/TermVectorEntryFreqSortedComparator.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorEntryFreqSortedComparator.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorEntryFreqSortedComparator.cs Tue Jul 15 14:44:04 2008
@@ -25,7 +25,7 @@
///
///
/// </summary>
- public class TermVectorEntryFreqSortedComparator : System.Collections.IComparer
+ public class TermVectorEntryFreqSortedComparator : System.Collections.Generic.IComparer<Object>
{
public virtual int Compare(System.Object object_Renamed, System.Object object1)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/TermVectorsReader.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/TermVectorsReader.cs Tue Jul 15 14:44:04 2008
@@ -26,7 +26,7 @@
/// <version> $Id: TermVectorsReader.java 601337 2007-12-05 13:59:37Z mikemccand $
/// </version>
- class TermVectorsReader : System.ICloneable
+ public class TermVectorsReader : System.ICloneable
{
internal const int FORMAT_VERSION = 2;
@@ -50,7 +50,7 @@
private int tvdFormat;
private int tvfFormat;
- internal TermVectorsReader(Directory d, System.String segment, FieldInfos fieldInfos) : this(d, segment, fieldInfos, BufferedIndexInput.BUFFER_SIZE)
+ public /*internal*/ TermVectorsReader(Directory d, System.String segment, FieldInfos fieldInfos) : this(d, segment, fieldInfos, BufferedIndexInput.BUFFER_SIZE)
{
}
@@ -228,7 +228,7 @@
/// <returns> The TermFreqVector for the document and field or null if there is no termVector for this field.
/// </returns>
/// <throws> IOException if there is an error reading the term vector files </throws>
- internal virtual TermFreqVector Get(int docNum, System.String field)
+ public /*internal*/ virtual TermFreqVector Get(int docNum, System.String field)
{
// Check if no term vectors are available for this segment at all
ParallelArrayTermVectorMapper mapper = new ParallelArrayTermVectorMapper();
@@ -245,7 +245,7 @@
/// <returns> All term frequency vectors
/// </returns>
/// <throws> IOException if there is an error reading the term vector files </throws>
- internal virtual TermFreqVector[] Get(int docNum)
+ public /*internal*/ virtual TermFreqVector[] Get(int docNum)
{
TermFreqVector[] result = null;
if (tvx != null)
Propchange: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net-2.3.1.ndoc
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Lucene.Net.sln?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.sln (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.sln Tue Jul 15 14:44:04 2008
@@ -1,24 +1,20 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net-2.0.0", "Lucene.Net-2.0.0.csproj", "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lucene.Net-2.3.1-VS2005", "Lucene.Net-2.3.1-VS2005.csproj", "{F04CA2F4-E182-46A8-B914-F46AF5319E83}"
EndProject
Global
- GlobalSection(DPCodeReviewSolutionGUID) = preSolution
- DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
EndGlobalSection
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug.ActiveCfg = Debug|.NET
- {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Debug.Build.0 = Debug|.NET
- {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release.ActiveCfg = Release|.NET
- {F04CA2F4-E182-46A8-B914-F46AF5319E83}.Release.Build.0 = Release|.NET
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/BooleanQuery.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanQuery.cs Tue Jul 15 14:44:04 2008
@@ -31,6 +31,7 @@
[Serializable]
public class BooleanQuery : Query, System.ICloneable
{
+ [Serializable]
private class AnonymousClassSimilarityDelegator : SimilarityDelegator
{
private void InitBlock(BooleanQuery enclosingInstance)
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/BooleanScorer.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanScorer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/BooleanScorer.cs Tue Jul 15 14:44:04 2008
@@ -249,6 +249,7 @@
public BucketTable()
{
+ InitBlock();
}
public int Size()
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ExtendedFieldCacheImpl.cs Tue Jul 15 14:44:04 2008
@@ -30,7 +30,7 @@
///
///
/// </summary>
- class ExtendedFieldCacheImpl : FieldCacheImpl, ExtendedFieldCache
+ public class ExtendedFieldCacheImpl : FieldCacheImpl, ExtendedFieldCache
{
public ExtendedFieldCacheImpl()
{
@@ -204,32 +204,36 @@
*/
// Java 1.3 level code:
- try
- {
- System.Int32.Parse(termtext);
- ret = Enclosing_Instance.GetInts(reader, field);
- }
- catch (System.FormatException nfe1)
- {
- try
- {
- System.Int64.Parse(termtext);
- ret = ((ExtendedFieldCacheImpl) Enclosing_Instance).GetLongs(reader, field);
- }
- catch (System.FormatException nfe2)
- {
- try
- {
- System.Single.Parse(termtext);
- ret = Enclosing_Instance.GetFloats(reader, field);
- }
- catch (System.FormatException nfe3)
- {
- ret = Enclosing_Instance.GetStringIndex(reader, field);
- }
- }
- }
- }
+ try
+ {
+ int parsedIntValue;
+ long parsedLongValue;
+ if (int.TryParse(termtext, out parsedIntValue))
+ {
+ ret = Enclosing_Instance.GetInts(reader, field);
+ }
+ else if (long.TryParse(termtext, out parsedLongValue))
+ {
+ ret = ((ExtendedFieldCacheImpl)Enclosing_Instance).GetLongs(reader, field);
+ }
+ else
+ {
+ try
+ {
+ SupportClass.Single.Parse(termtext);
+ ret = Enclosing_Instance.GetFloats(reader, field);
+ }
+ catch (System.FormatException)
+ {
+ ret = Enclosing_Instance.GetStringIndex(reader, field);
+ }
+ }
+ }
+ catch (System.Exception)
+ {
+ ret = Enclosing_Instance.GetStringIndex(reader, field);
+ }
+ }
else
{
throw new System.SystemException("field \"" + field + "\" does not appear to be indexed");
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/FieldCacheImpl.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs Tue Jul 15 14:44:04 2008
@@ -37,7 +37,7 @@
/// </since>
/// <version> $Id: FieldCacheImpl.java 605225 2007-12-18 15:13:05Z gsingers $
/// </version>
- class FieldCacheImpl : FieldCache
+ public class FieldCacheImpl : FieldCache
{
public virtual void Close(IndexReader reader)
{
@@ -72,7 +72,7 @@
{
public virtual float ParseFloat(System.String value_Renamed)
{
- return System.Single.Parse(value_Renamed);
+ return SupportClass.Single.Parse(value_Renamed);
}
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/ByteFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ByteFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -77,7 +77,7 @@
return Enclosing_Instance.Description() + '=' + IntVal(doc);
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/DocValues.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/DocValues.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/DocValues.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/DocValues.cs Tue Jul 15 14:44:04 2008
@@ -112,7 +112,7 @@
/// these test elements to be tested, Otherwise the test would not fail, just
/// print a warning.
/// </summary>
- internal virtual System.Object GetInnerArray()
+ public /*internal*/ virtual System.Object GetInnerArray()
{
throw new System.NotSupportedException("this optional method is for test purposes only");
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/FloatFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/FloatFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/FloatFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/FloatFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -75,7 +75,7 @@
return Enclosing_Instance.Description() + '=' + arr[doc];
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/IntFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/IntFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/IntFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/IntFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -79,7 +79,7 @@
return Enclosing_Instance.Description() + '=' + IntVal(doc);
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/OrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/OrdFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/OrdFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/OrdFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -88,7 +88,7 @@
return Enclosing_Instance.Description() + '=' + IntVal(doc);
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ReverseOrdFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/ReverseOrdFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ReverseOrdFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ReverseOrdFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -96,7 +96,7 @@
return Enclosing_Instance.Description() + '=' + StrVal(doc);
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ShortFieldSource.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/ShortFieldSource.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ShortFieldSource.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ShortFieldSource.cs Tue Jul 15 14:44:04 2008
@@ -76,7 +76,7 @@
return Enclosing_Instance.Description() + '=' + IntVal(doc);
}
/*(non-Javadoc) @see Lucene.Net.Search.Function.DocValues#getInnerArray() */
- internal override System.Object GetInnerArray()
+ public /*internal*/ override System.Object GetInnerArray()
{
return arr;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ValueSourceQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Function/ValueSourceQuery.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ValueSourceQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Function/ValueSourceQuery.cs Tue Jul 15 14:44:04 2008
@@ -44,6 +44,12 @@
public class ValueSourceQuery : Query
{
internal ValueSource valSrc;
+
+ // for testing
+ public ValueSource ValSrc_ForNUnitTest
+ {
+ get { return valSrc; }
+ }
/// <summary> Create a value source query</summary>
/// <param name="valSrc">provides the values defines the function to be used for scoring
@@ -251,7 +257,7 @@
}
override public System.Object Clone()
{
- return null; /// {{Aroush-2.3.1}} Do we need this Clone() method?
+ return this.MemberwiseClone();
}
}
}
\ No newline at end of file
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Hits.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Hits.cs Tue Jul 15 14:44:04 2008
@@ -56,7 +56,7 @@
private int lengthAtStart; // this is the number apps usually count on (although deletions can bring it down).
private int nDeletedHits = 0; // # of already collected hits that were meanwhile deleted.
- internal bool debugCheckedForDeletions = false; // for test purposes.
+ public /*internal*/ bool debugCheckedForDeletions = false; // for test purposes.
internal Hits(Searcher s, Query q, Filter f)
{
@@ -142,7 +142,7 @@
int end = scoreDocs.Length < length ? scoreDocs.Length : length;
length += nDeletedHits;
- for (int i = hitDocs.Count; i < end; i++)
+ for (int i = start; i < end; i++)
{
hitDocs.Add(new HitDoc(scoreDocs[i].score * scoreNorm, scoreDocs[i].doc));
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/FSDirectory.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs Tue Jul 15 14:44:04 2008
@@ -676,7 +676,7 @@
return this.GetType().FullName + "@" + directory;
}
- protected internal class FSIndexInput : BufferedIndexInput, System.ICloneable
+ public /*protected internal*/ class FSIndexInput : BufferedIndexInput, System.ICloneable
{
private class Descriptor : System.IO.BinaryReader
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/RAMFile.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs Tue Jul 15 14:44:04 2008
@@ -35,7 +35,7 @@
private long lastModified = System.DateTime.Now.Ticks;
// File used as buffer, in no RAMDirectory
- internal RAMFile()
+ protected internal RAMFile()
{
}
@@ -120,7 +120,7 @@
/// </param>
/// <returns> allocated buffer.
/// </returns>
- internal virtual byte[] NewBuffer(int size)
+ protected internal virtual byte[] NewBuffer(int size)
{
return new byte[size];
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMInputStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/RAMInputStream.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMInputStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMInputStream.cs Tue Jul 15 14:44:04 2008
@@ -39,8 +39,14 @@
private int bufferPosition;
private long bufferStart;
private int bufferLength;
+
+ // for testing
+ public static RAMInputStream RAMInputStream_ForNUnitTest(RAMFile f)
+ {
+ return new RAMInputStream(f);
+ }
- internal RAMInputStream(RAMFile f)
+ public /*internal*/ RAMInputStream(RAMFile f)
{
file = f;
length = file.length;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/RAMOutputStream.cs?rev=677059&r1=677058&r2=677059&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs Tue Jul 15 14:44:04 2008
@@ -29,6 +29,7 @@
public class RAMOutputStream:IndexOutput
{
internal const int BUFFER_SIZE = 1024;
+ public const int BUFFER_SIZE_ForNUnitTest = BUFFER_SIZE;
private RAMFile file;