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 2007/08/11 18:56:44 UTC
svn commit: r564939 [1/8] - in /incubator/lucene.net/trunk/C#/src: ./ Demo/
Demo/DeleteFiles/ Demo/DemoLib/ Demo/IndexFiles/ Demo/IndexHtml/
Demo/SearchFiles/ Lucene.Net/ Lucene.Net/Analysis/Standard/
Lucene.Net/Document/ Lucene.Net/Index/ Lucene.Net/Q...
Author: aroush
Date: Sat Aug 11 09:56:37 2007
New Revision: 564939
URL: http://svn.apache.org/viewvc?view=rev&rev=564939
Log:
Beta release of Lucene.Net 2.1 build 2. Change set includes:
- Release: Apache Lucene.Net.2.1 build 002 "Beta"
- Port: Ported the "Test" code from Java to C#
- Fix: LUCENENET-47: "Make up for Constansts.cs"
- Fix: LUCENENET-48 "Clone method of SegmentInfos.cs does'nt copy local fields/variables."
- Fix: LUCENENET-50 "Improvement for FSDirectory."
- Fix: LUCENENET-52 "IndexFileDeleter in svn trunk"
- Fix: LUCENENET-53 "SegmentsInfos.GetCurrentSegmentGeneration works incorrectly"
- Issues: A number of NUnit tests are failing.
Added:
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/TestIndexFileDeleter.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/TestLazyBug.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestLazyProxSkipping.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestNorms.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelTermEnum.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestStressIndexing.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermdocPerf.cs
incubator/lucene.net/trunk/C#/src/Test/Index/index.prelockless.cfs.zip (with props)
incubator/lucene.net/trunk/C#/src/Test/Index/index.prelockless.nocfs.zip (with props)
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/TestComplexExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestComplexExplanationsOfNonMatches.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestExplanations.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestPrefixFilter.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestScorerPerf.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/TestTermScorer.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestThreadSafe.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/TestLockFactory.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestWindowsMMap.cs
incubator/lucene.net/trunk/C#/src/Test/Test-VS2005.csproj
incubator/lucene.net/trunk/C#/src/Test/Test-VS2005.sln
incubator/lucene.net/trunk/C#/src/Test/Util/_TestUtil.cs
Removed:
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/TestInputStream.cs
incubator/lucene.net/trunk/C#/src/Test/Util/StringHelperTest.cs
Modified:
incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln
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/Standard/CharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/FastCharStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/ParseException.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardFilter.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Field.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileDeleter.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/SegmentInfos.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/QueryParser/MultiFieldQueryParser.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanQuery.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexInput.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Constants.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/AnalysisTest.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/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/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/TestIndexWriterMerging.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestMultiReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestParallelReader.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/TestTermVectorsReader.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestTermVectorsWriter.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestWordlistLoader.cs
incubator/lucene.net/trunk/C#/src/Test/IndexTest.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/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/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/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/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/TestSetNorm.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSimilarity.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.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/SearchTestForDuplicates.cs
incubator/lucene.net/trunk/C#/src/Test/Store/TestLock.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.csproj
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
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -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.1.0.001")]
+[assembly: AssemblyVersion("2.1.0.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/Demo-VS2005.sln
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/Demo-VS2005.sln?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/Demo-VS2005.sln Sat Aug 11 09:56:37 2007
@@ -37,6 +37,7 @@
EndGlobalSection
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
{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA3A94CC-6D1E-4AA8-9C95-8C6FD896810E}.Debug|Any CPU.Build.0 = Debug|Any CPU
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -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.1.0.001")]
+[assembly: AssemblyVersion("2.1.0.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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -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.1.0.001")]
+[assembly: AssemblyVersion("2.1.0.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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -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.1.0.001")]
+[assembly: AssemblyVersion("2.1.0.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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -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.1.0.001")]
+[assembly: AssemblyVersion("2.1.0.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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/HISTORY.txt (original)
+++ incubator/lucene.net/trunk/C#/src/HISTORY.txt Sat Aug 11 09:56:37 2007
@@ -2,6 +2,17 @@
-------------------------
+11Aug07:
+ - Release: Apache Lucene.Net.2.1 build 002 "Beta"
+ - Port: Ported the "Test" code from Java to C#
+ - Fix: LUCENENET-47: "Make up for Constansts.cs"
+ - Fix: LUCENENET-48 "Clone method of SegmentInfos.cs does'nt copy local fields/variables."
+ - Fix: LUCENENET-50 "Improvement for FSDirectory."
+ - Fix: LUCENENET-52 "IndexFileDeleter in svn trunk"
+ - Fix: LUCENENET-53 "SegmentsInfos.GetCurrentSegmentGeneration works incorrectly"
+ - Issues: A number of NUnit tests are failing.
+
+
01May07:
- Dev Release: Apache Lucene.Net.2.1 build 001 "early-Alpha"
- Issues: Optimizing an index will cause an exception.
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/CharStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/Standard/CharStream.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/CharStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/CharStream.cs Sat Aug 11 09:56:37 2007
@@ -17,6 +17,7 @@
/* Generated By:JavaCC: Do not edit this line. CharStream.java Version 3.0 */
using System;
+
namespace Lucene.Net.Analysis.Standard
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/FastCharStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/Standard/FastCharStream.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/FastCharStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/FastCharStream.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
namespace Lucene.Net.Analysis.Standard
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/ParseException.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/Standard/ParseException.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/ParseException.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/ParseException.cs Sat Aug 11 09:56:37 2007
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/* Generated By:JavaCC: Do not edit this line. ParseException.java Version 0.7pre6 */
+
using System;
+
namespace Lucene.Net.Analysis.Standard
{
@@ -12,7 +31,7 @@
/// mechanisms so long as you retain the public fields.
/// </summary>
[Serializable]
- public class ParseException:System.IO.IOException
+ public class ParseException : System.IO.IOException
{
/// <summary> This method has the standard behavior when this object has been
/// created using the standard constructors. Otherwise, it uses
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardAnalyzer.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using Lucene.Net.Analysis;
namespace Lucene.Net.Analysis.Standard
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Analysis/Standard/StandardFilter.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Analysis/Standard/StandardFilter.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using Lucene.Net.Analysis;
namespace Lucene.Net.Analysis.Standard
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -24,7 +24,7 @@
// associated with an assembly.
//
[assembly: AssemblyTitle("Apache Lucene.Net")]
-[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net text search library")]
+[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net full-text search library")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net")]
@@ -33,7 +33,7 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.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.001")]
+[assembly: AssemblyVersion("2.1.0.002")]
//
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Field.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Document/Field.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Field.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Document/Field.cs Sat Aug 11 09:56:37 2007
@@ -29,12 +29,12 @@
/// </summary>
[Serializable]
- public sealed class Field:AbstractField, Fieldable
+ public sealed class Field : AbstractField, Fieldable
{
/// <summary>Specifies whether and how a field should be stored. </summary>
[Serializable]
- public sealed class Store:Parameter
+ public sealed class Store : Parameter
{
internal Store(System.String name):base(name)
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs Sat Aug 11 09:56:37 2007
@@ -48,5 +48,11 @@
this.storePositionWithTermVector = storePositionWithTermVector;
this.omitNorms = omitNorms;
}
+
+ // For testing only
+ public System.String Name
+ {
+ get { return name; }
+ }
}
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileDeleter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/IndexFileDeleter.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileDeleter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileDeleter.cs Sat Aug 11 09:56:37 2007
@@ -35,7 +35,7 @@
private SegmentInfos segmentInfos;
private System.IO.TextWriter infoStream;
- internal IndexFileDeleter(SegmentInfos segmentInfos, Directory directory)
+ public IndexFileDeleter(SegmentInfos segmentInfos, Directory directory)
{
this.segmentInfos = segmentInfos;
this.directory = directory;
@@ -63,7 +63,7 @@
/// file is successfully deleted.
/// </summary>
- internal void FindDeletableFiles()
+ public void FindDeletableFiles()
{
// Gather all "current" segments:
@@ -327,7 +327,7 @@
System.Collections.IEnumerator it = pending.GetEnumerator();
while (it.MoveNext())
{
- deletable.Add(it.Current);
+ deletable.Add(((System.Collections.DictionaryEntry)(it.Current)).Value);
}
pending = null;
DeleteFiles();
@@ -343,7 +343,7 @@
deletable.Add(fileName);
}
- internal void DeleteFiles()
+ public void DeleteFiles()
{
if (deletable != null)
{
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexFileNames.cs Sat Aug 11 09:56:37 2007
@@ -27,22 +27,22 @@
/// </author>
/// <version> $rcs = ' $Id: Exp $ ' ;
/// </version>
- sealed class IndexFileNames
+ sealed public class IndexFileNames
{
/// <summary>Name of the index segment file </summary>
- internal const System.String SEGMENTS = "segments";
+ public const System.String SEGMENTS = "segments";
/// <summary>Name of the generation reference file name </summary>
- internal const System.String SEGMENTS_GEN = "segments.gen";
+ public const System.String SEGMENTS_GEN = "segments.gen";
/// <summary>Name of the index deletable file (only used in
/// pre-lockless indices)
/// </summary>
- internal const System.String DELETABLE = "deletable";
+ public const System.String DELETABLE = "deletable";
/// <summary>Extension of norms file </summary>
- internal const System.String NORMS_EXTENSION = "nrm";
+ public const System.String NORMS_EXTENSION = "nrm";
/// <summary> This array contains all filename extensions used by
/// Lucene's index files, with two exceptions, namely the
@@ -51,13 +51,13 @@
/// Lucene's <code>segments_N</code> files do not have any
/// filename extension.
/// </summary>
- internal static readonly System.String[] INDEX_EXTENSIONS = new System.String[]{"cfs", "fnm", "fdx", "fdt", "tii", "tis", "frq", "prx", "del", "tvx", "tvd", "tvf", "gen", "nrm"};
+ public static readonly System.String[] INDEX_EXTENSIONS = new System.String[]{"cfs", "fnm", "fdx", "fdt", "tii", "tis", "frq", "prx", "del", "tvx", "tvd", "tvf", "gen", "nrm"};
/// <summary>File extensions of old-style index files </summary>
- internal static readonly System.String[] COMPOUND_EXTENSIONS = new System.String[]{"fnm", "frq", "prx", "fdx", "fdt", "tii", "tis"};
+ public static readonly System.String[] COMPOUND_EXTENSIONS = new System.String[]{"fnm", "frq", "prx", "fdx", "fdt", "tii", "tis"};
/// <summary>File extensions for term vector support </summary>
- internal static readonly System.String[] VECTOR_EXTENSIONS = new System.String[]{"tvx", "tvd", "tvf"};
+ public static readonly System.String[] VECTOR_EXTENSIONS = new System.String[]{"tvx", "tvd", "tvf"};
/// <summary> Computes the full file name from base, extension and
/// generation. If the generation is -1, the file name is
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexReader.cs Sat Aug 11 09:56:37 2007
@@ -745,7 +745,7 @@
///
/// </summary>
/// <throws> IOException </throws>
- protected internal void Commit()
+ public 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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/IndexWriter.cs Sat Aug 11 09:56:37 2007
@@ -912,7 +912,7 @@
}
// for test purpose
- internal int GetSegmentCount()
+ public int GetSegmentCount()
{
lock (this)
{
@@ -921,7 +921,7 @@
}
// for test purpose
- internal int GetRamSegmentCount()
+ public int GetRamSegmentCount()
{
lock (this)
{
@@ -930,7 +930,7 @@
}
// for test purpose
- internal int GetDocCount(int i)
+ public int GetDocCount(int i)
{
lock (this)
{
@@ -2049,7 +2049,7 @@
}
// For test purposes.
- internal int GetBufferedDeleteTermsSize()
+ public int GetBufferedDeleteTermsSize()
{
lock (this)
{
@@ -2058,7 +2058,7 @@
}
// For test purposes.
- internal int GetNumBufferedDeleteTerms()
+ public int GetNumBufferedDeleteTerms()
{
lock (this)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/SegmentInfos.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentInfos.cs Sat Aug 11 09:56:37 2007
@@ -149,7 +149,7 @@
int prefixLen = IndexFileNames.SEGMENTS.Length + 1;
for (int i = 0; i < files.Length; i++)
{
- System.String file = files[i];
+ System.String file = (new System.IO.FileInfo(files[i])).Name;
if (file.StartsWith(IndexFileNames.SEGMENTS) && !file.Equals(IndexFileNames.SEGMENTS_GEN))
{
if (file.Equals(IndexFileNames.SEGMENTS))
@@ -379,9 +379,16 @@
public override System.Object Clone()
{
SegmentInfos sis = new SegmentInfos();
- for (int i = 0; i < sis.Count; i++)
+
+ // Copy Fields. const and static fields are ignored
+ sis.counter = this.counter;
+ sis.version = this.version;
+ sis.generation = this.generation;
+ sis.lastGeneration = this.lastGeneration;
+
+ for (int i = 0; i < this.Count; i++)
{
- sis.Add(((SegmentInfo) this[i]).Clone());
+ sis.Add(((SegmentInfo)this[i]).Clone());
}
return sis;
}
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentMerger.cs Sat Aug 11 09:56:37 2007
@@ -37,7 +37,7 @@
/// </seealso>
/// <seealso cref="#add">
/// </seealso>
- sealed class SegmentMerger
+ public sealed class SegmentMerger
{
private class AnonymousClassFieldSelector : FieldSelector
{
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/SegmentReader.cs Sat Aug 11 09:56:37 2007
@@ -61,6 +61,12 @@
get { return fieldInfos; }
}
+ public IndexInput ProxStream
+ {
+ get { return proxStream; }
+ set { proxStream = value; }
+ }
+
private class Norm
{
private void InitBlock(SegmentReader enclosingInstance)
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/MultiFieldQueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/QueryParser/MultiFieldQueryParser.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/MultiFieldQueryParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/MultiFieldQueryParser.cs Sat Aug 11 09:56:37 2007
@@ -95,7 +95,7 @@
this.fields = fields;
}
- protected internal override Query GetFieldQuery(System.String field, System.String queryText, int slop)
+ public override Query GetFieldQuery(System.String field, System.String queryText, int slop)
{
if (field == null)
{
@@ -136,13 +136,13 @@
}
- protected internal override Query GetFieldQuery(System.String field, System.String queryText)
+ public override Query GetFieldQuery(System.String field, System.String queryText)
{
return GetFieldQuery(field, queryText, 0);
}
- protected internal override Query GetFuzzyQuery(System.String field, System.String termStr, float minSimilarity)
+ public override Query GetFuzzyQuery(System.String field, System.String termStr, float minSimilarity)
{
if (field == null)
{
@@ -156,7 +156,7 @@
return base.GetFuzzyQuery(field, termStr, minSimilarity);
}
- protected internal override Query GetPrefixQuery(System.String field, System.String termStr)
+ public override Query GetPrefixQuery(System.String field, System.String termStr)
{
if (field == null)
{
@@ -170,7 +170,7 @@
return base.GetPrefixQuery(field, termStr);
}
- protected internal override Query GetWildcardQuery(System.String field, System.String termStr)
+ public override Query GetWildcardQuery(System.String field, System.String termStr)
{
if (field == null)
{
@@ -185,7 +185,7 @@
}
- protected internal override Query GetRangeQuery(System.String field, System.String part1, System.String part2, bool inclusive)
+ public override Query GetRangeQuery(System.String field, System.String part1, System.String part2, bool inclusive)
{
if (field == null)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/QueryParser/QueryParser.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/QueryParser/QueryParser.cs Sat Aug 11 09:56:37 2007
@@ -402,7 +402,7 @@
return resolution;
}
- protected internal virtual void AddClause(System.Collections.ArrayList clauses, int conj, int mods, Query q)
+ public virtual void AddClause(System.Collections.ArrayList clauses, int conj, int mods, Query q)
{
bool required, prohibited;
@@ -462,7 +462,7 @@
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetFieldQuery(System.String field, System.String queryText)
+ public virtual Query GetFieldQuery(System.String field, System.String queryText)
{
// Use the analyzer to get all the tokens, and then build a TermQuery,
// PhraseQuery, or nothing based on the term count
@@ -564,7 +564,7 @@
/// </summary>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetFieldQuery(System.String field, System.String queryText, int slop)
+ public virtual Query GetFieldQuery(System.String field, System.String queryText, int slop)
{
Query query = GetFieldQuery(field, queryText);
@@ -583,7 +583,7 @@
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetRangeQuery(System.String field, System.String part1, System.String part2, bool inclusive)
+ public virtual Query GetRangeQuery(System.String field, System.String part1, System.String part2, bool inclusive)
{
if (lowercaseExpandedTerms)
{
@@ -668,7 +668,7 @@
/// </returns>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetBooleanQuery(System.Collections.ArrayList clauses)
+ public virtual Query GetBooleanQuery(System.Collections.ArrayList clauses)
{
return GetBooleanQuery(clauses, false);
}
@@ -690,7 +690,7 @@
/// </returns>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetBooleanQuery(System.Collections.ArrayList clauses, bool disableCoord)
+ public virtual Query GetBooleanQuery(System.Collections.ArrayList clauses, bool disableCoord)
{
BooleanQuery query = new BooleanQuery(disableCoord);
for (int i = 0; i < clauses.Count; i++)
@@ -724,7 +724,7 @@
/// </returns>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetWildcardQuery(System.String field, System.String termStr)
+ public virtual Query GetWildcardQuery(System.String field, System.String termStr)
{
if ("*".Equals(field))
{
@@ -767,7 +767,7 @@
/// </returns>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetPrefixQuery(System.String field, System.String termStr)
+ public virtual Query GetPrefixQuery(System.String field, System.String termStr)
{
if (!allowLeadingWildcard && termStr.StartsWith("*"))
throw new ParseException("'*' not allowed as first character in PrefixQuery");
@@ -794,7 +794,7 @@
/// </returns>
/// <exception cref=""> ParseException throw in overridden method to disallow
/// </exception>
- protected internal virtual Query GetFuzzyQuery(System.String field, System.String termStr, float minSimilarity)
+ public virtual Query GetFuzzyQuery(System.String field, System.String termStr, float minSimilarity)
{
if (lowercaseExpandedTerms)
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Spans/SpanQuery.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanQuery.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Spans/SpanQuery.cs Sat Aug 11 09:56:37 2007
@@ -27,7 +27,7 @@
/// <summary>Base class for span-based queries. </summary>
[Serializable]
- public abstract class SpanQuery:Query
+ public abstract class SpanQuery : Query
{
/// <summary>Expert: Returns the matches for this query in an index. Used internally
/// to search for spans.
@@ -48,5 +48,10 @@
{
return new SpanWeight(this, searcher);
}
- }
+
+ public Weight CreateWeight_ForNUnitTest(Searcher searcher)
+ {
+ return new SpanWeight(this, searcher);
+ }
+ }
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/TermScorer.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/TermScorer.cs Sat Aug 11 09:56:37 2007
@@ -23,7 +23,7 @@
{
/// <summary>Expert: A <code>Scorer</code> for documents matching a <code>Term</code>.</summary>
- sealed class TermScorer : Scorer
+ sealed public class TermScorer : Scorer
{
private Weight weight;
private TermDocs termDocs;
@@ -48,7 +48,7 @@
/// </param>
/// <param name="norms">The field norms of the document fields for the <code>Term</code>.
/// </param>
- internal TermScorer(Weight weight, TermDocs td, Similarity similarity, byte[] norms) : base(similarity)
+ public TermScorer(Weight weight, TermDocs td, Similarity similarity, byte[] norms) : base(similarity)
{
this.weight = weight;
this.termDocs = td;
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexInput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/BufferedIndexInput.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexInput.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/BufferedIndexInput.cs Sat Aug 11 09:56:37 2007
@@ -30,6 +30,11 @@
private long bufferStart = 0; // position in file of buffer
private int bufferLength = 0; // end of valid bytes
private int bufferPosition = 0; // next byte to read
+
+ public static int BUFFER_SIZE_ForNUnitTest
+ {
+ get { return BUFFER_SIZE; }
+ }
public override byte ReadByte()
{
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs Sat Aug 11 09:56:37 2007
@@ -258,7 +258,7 @@
tmpBool = System.IO.Directory.Exists(directory.FullName);
if (tmpBool)
{
- System.String[] files = System.IO.Directory.GetFileSystemEntries(directory.FullName); // directory.list(IndexFileNameFilter.GetFilter()); // clear old files // {{Aroush-2.1}} we don't want all files in the directory but a filtered list
+ System.String[] files = SupportClass.FileSupport.GetLuceneIndexFiles(directory.FullName, IndexFileNameFilter.GetFilter());
if (files == null)
throw new System.IO.IOException("Cannot read directory " + directory.FullName);
for (int i = 0; i < files.Length; i++)
@@ -370,7 +370,7 @@
/// <summary>Returns an array of strings, one for each Lucene index file in the directory. </summary>
public override System.String[] List()
{
- System.String[] files = System.IO.Directory.GetFileSystemEntries(directory.FullName); // IndexFileNameFilter.GetFilter()); // {{Aroush-2.1}} we want to limit the files to the list
+ System.String[] files = SupportClass.FileSupport.GetLuceneIndexFiles(directory.FullName, IndexFileNameFilter.GetFilter());
for (int i = 0; i < files.Length; i++)
{
System.IO.FileInfo fi = new System.IO.FileInfo(files[i]);
@@ -704,13 +704,9 @@
/// <summary>Method used for testing. Returns true if the underlying
/// file descriptor is valid.
/// </summary>
- virtual internal bool FDValid
+ public virtual bool IsFDValid()
{
- get
- {
- return true; // return file.getFD().valid(); // {{Aroush-2.1 in .NET, how do we do this?
- }
-
+ return true; // return file.getFD().valid(); // {{Aroush-2.1 in .NET, how do we do this?
}
private class Descriptor : System.IO.BinaryReader
@@ -752,6 +748,11 @@
private Descriptor file;
internal bool isClone;
+ public bool isClone_ForNUnitTest
+ {
+ get { return isClone; }
+ }
+
public FSIndexInput(System.IO.FileInfo path)
{
file = new Descriptor(this, path, System.IO.FileAccess.Read);
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Store/RAMDirectory.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMDirectory.cs Sat Aug 11 09:56:37 2007
@@ -27,15 +27,26 @@
/// </summary>
/// <version> $Id: RAMDirectory.java 503911 2007-02-05 22:49:42Z dnaber $
/// </version>
- [Serializable]
- public class RAMDirectory : Directory
- {
+ [Serializable]
+ public class RAMDirectory : Directory
+ {
- private const long serialVersionUID = 1L;
+ private const long serialVersionUID = 1L;
- internal System.Collections.Hashtable fileMap = new System.Collections.Hashtable();
- internal long sizeInBytes = 0;
+ internal System.Collections.Hashtable fileMap = new System.Collections.Hashtable();
+ internal long sizeInBytes = 0;
+ public System.Collections.Hashtable fileMap_ForNUnitTest
+ {
+ get { return fileMap; }
+ }
+
+ public long sizeInBytes_ForNUnitTest
+ {
+ get { return sizeInBytes; }
+ set { sizeInBytes = value; }
+ }
+
// *****
// Lock acquisition sequence: RAMDirectory, then RAMFile
// *****
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMFile.cs Sat Aug 11 09:56:37 2007
@@ -40,7 +40,7 @@
{
}
- internal RAMFile(RAMDirectory directory)
+ public /*internal*/ RAMFile(RAMDirectory directory)
{
this.directory = directory;
}
@@ -103,5 +103,25 @@
return sizeInBytes;
}
}
- }
+
+ public long sizeInBytes_ForNUnitTest
+ {
+ get { return sizeInBytes; }
+ }
+
+ public RAMDirectory directory_ForNUnitTest
+ {
+ set { directory = value; }
+ }
+
+ public long length_ForNUnitTest
+ {
+ get { return length; }
+ }
+
+ public long GetSizeInBytes_ForNUnitTest()
+ {
+ return GetSizeInBytes();
+ }
+ }
}
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?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/RAMOutputStream.cs Sat Aug 11 09:56:37 2007
@@ -36,7 +36,7 @@
{
}
- internal RAMOutputStream(RAMFile f)
+ public /*internal*/ RAMOutputStream(RAMFile f)
{
file = f;
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SupportClass.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SupportClass.cs Sat Aug 11 09:56:37 2007
@@ -296,6 +296,29 @@
else
return null;
}
+
+ /// <summary>
+ /// Returns a list of files in a give directory.
+ /// </summary>
+ /// <param name="fullName">The full path name to the directory.</param>
+ /// <param name="indexFileNameFilter"></param>
+ /// <returns>An array containing the files.</returns>
+ public static System.String[] GetLuceneIndexFiles(System.String fullName,
+ Lucene.Net.Index.IndexFileNameFilter indexFileNameFilter)
+ {
+ System.IO.DirectoryInfo dInfo = new System.IO.DirectoryInfo(fullName);
+ System.Collections.ArrayList list = new System.Collections.ArrayList();
+ foreach (System.IO.FileInfo fInfo in dInfo.GetFiles())
+ {
+ if (indexFileNameFilter.Accept(fInfo, fInfo.Name) == true)
+ {
+ list.Add(fInfo.Name);
+ }
+ }
+ System.String[] retFiles = new System.String[list.Count];
+ list.CopyTo(retFiles);
+ return retFiles;
+ }
}
/// <summary>
@@ -451,6 +474,23 @@
}
}
return -1;
+ }
+
+
+ /// <summary>
+ /// Returns the number of bits set to true in this BitSet.
+ /// </summary>
+ /// <param name="bits">The BitArray object.</param>
+ /// <returns>The number of bits set to true in this BitSet.</returns>
+ public static int Cardinality(System.Collections.BitArray bits)
+ {
+ int count = 0;
+ for (int i = 0; i < bits.Count; i++)
+ {
+ if (bits[i] == true)
+ count++;
+ }
+ return count;
}
}
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Constants.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Util/Constants.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Constants.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Util/Constants.cs Sat Aug 11 09:56:37 2007
@@ -51,17 +51,17 @@
{
} // can't construct
- // {{Aroush-2.1 those next constants are Java specific, what's the equivlant in C#?
- /// <summary>The value of <tt>System.getProperty("java.version")<tt>. *</summary>
- public static readonly System.String JAVA_VERSION = System.Configuration.ConfigurationSettings.AppSettings.Get("java.version"); // {{Aroush-1.9}}
- /// <summary>True iff this is Java version 1.1. </summary>
- public static readonly bool JAVA_1_1 = JAVA_VERSION.StartsWith("1.1.");
- /// <summary>True iff this is Java version 1.2. </summary>
- public static readonly bool JAVA_1_2 = JAVA_VERSION.StartsWith("1.2.");
- /// <summary>True iff this is Java version 1.3. </summary>
- public static readonly bool JAVA_1_3 = JAVA_VERSION.StartsWith("1.3.");
+ /// <summary>Lucene.Net Runtime version</summary>
+ public static readonly string DOTNET_VERSION = System.Reflection.Assembly.GetAssembly(typeof(Lucene.Net.Index.IndexReader)).ImageRuntimeVersion.Substring(1);
+ /// <summary>True iff Lucene.Net Runtime version is 1.0</summary>
+ public static readonly bool DOTNET_VERSION_1_0 = DOTNET_VERSION.StartsWith("1.0.");
+ /// <summary>True iff Lucene.Net Runtime version is 1.1</summary>
+ public static readonly bool DOTNET_VERSION_1_1 = DOTNET_VERSION.StartsWith("1.1.");
+ /// <summary>True iff Lucene.Net Runtime version is 2.0</summary>
+ public static readonly bool DOTNET_VERSION_2_0 = DOTNET_VERSION.StartsWith("2.0.");
+ /// <summary>True iff Lucene.Net Runtime version is 3.0</summary>
+ public static readonly bool DOTNET_VERSION_3_0 = DOTNET_VERSION.StartsWith("3.0.");
- // {{Aroush-2.1 are those envirement variables work with .NET
/// <summary>The value of <tt>System.getProperty("os.name")<tt>. *</summary>
public static readonly System.String OS_NAME = System.Environment.GetEnvironmentVariable("OS");
/// <summary>True iff running on Linux. </summary>
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestAnalyzers.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestAnalyzers.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestAnalyzers.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestAnalyzers.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestISOLatin1AccentFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestISOLatin1AccentFilter.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestISOLatin1AccentFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestISOLatin1AccentFilter.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestKeywordAnalyzer.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestKeywordAnalyzer.cs Sat Aug 11 09:56:37 2007
@@ -16,15 +16,17 @@
*/
using System;
+
using NUnit.Framework;
+
+using IndexWriter = Lucene.Net.Index.IndexWriter;
+using RAMDirectory = Lucene.Net.Store.RAMDirectory;
using Document = Lucene.Net.Documents.Document;
using Field = Lucene.Net.Documents.Field;
-using IndexWriter = Lucene.Net.Index.IndexWriter;
-using QueryParser = Lucene.Net.QueryParsers.QueryParser;
-using Hits = Lucene.Net.Search.Hits;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using Query = Lucene.Net.Search.Query;
-using RAMDirectory = Lucene.Net.Store.RAMDirectory;
+using Hits = Lucene.Net.Search.Hits;
+using QueryParser = Lucene.Net.QueryParsers.QueryParser;
namespace Lucene.Net.Analysis
{
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestLengthFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestLengthFilter.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestLengthFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestLengthFilter.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestPerFieldAnalzyerWrapper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestPerFieldAnalzyerWrapper.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestPerFieldAnalzyerWrapper.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestPerFieldAnalzyerWrapper.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStandardAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestStandardAnalyzer.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStandardAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStandardAnalyzer.cs Sat Aug 11 09:56:37 2007
@@ -16,7 +16,9 @@
*/
using System;
+
using NUnit.Framework;
+
using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
namespace Lucene.Net.Analysis
@@ -60,9 +62,19 @@
// possessives are actually removed by StardardFilter, not the tokenizer
AssertAnalyzesTo(a, "O'Reilly", new System.String[]{"o'reilly"});
AssertAnalyzesTo(a, "you're", new System.String[]{"you're"});
- AssertAnalyzesTo(a, "O'Reilly's", new System.String[]{"o'reilly"});
+ AssertAnalyzesTo(a, "she's", new System.String[]{"she"});
+ AssertAnalyzesTo(a, "Jim's", new System.String[]{"jim"});
+ AssertAnalyzesTo(a, "don't", new System.String[]{"don't"});
+ AssertAnalyzesTo(a, "O'Reilly's", new System.String[]{"o'reilly"});
+
+ // t and s had been stopwords in Lucene <= 2.0, which made it impossible
+ // to correctly search for these terms:
+ AssertAnalyzesTo(a, "s-class", new System.String[]{"s", "class"});
+ AssertAnalyzesTo(a, "t-com", new System.String[]{"t", "com"});
+ // 'a' is still a stopword:
+ AssertAnalyzesTo(a, "a-class", new System.String[]{"class"});
- // company names
+ // company names
AssertAnalyzesTo(a, "AT&T", new System.String[]{"at&t"});
AssertAnalyzesTo(a, "Excite@Home", new System.String[]{"excite@home"});
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestStopAnalyzer.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopAnalyzer.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Analysis/TestStopFilter.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopFilter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Analysis/TestStopFilter.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using NUnit.Framework;
namespace Lucene.Net.Analysis
Modified: incubator/lucene.net/trunk/C#/src/Test/AnalysisTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/AnalysisTest.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/AnalysisTest.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/AnalysisTest.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using Analyzer = Lucene.Net.Analysis.Analyzer;
using SimpleAnalyzer = Lucene.Net.Analysis.SimpleAnalyzer;
using Token = Lucene.Net.Analysis.Token;
Modified: incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/AssemblyInfo.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs Sat Aug 11 09:56:37 2007
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -7,7 +24,7 @@
// associated with an assembly.
//
[assembly: AssemblyTitle("Apache Lucene.Net")]
-[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net a full-text search engine library")]
+[assembly: AssemblyDescription("The Apache Software Foundation Lucene.Net full-text search library")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("The Apache Software Foundation")]
[assembly: AssemblyProduct("Lucene.Net.Test")]
@@ -16,7 +33,8 @@
[assembly: AssemblyDefaultAlias("Lucene.Net")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersionAttribute("2.0")]
+[assembly: AssemblyInformationalVersionAttribute("2.1")]
+
//
// Version information for an assembly consists of the following four values:
@@ -29,7 +47,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.0.003")]
+[assembly: AssemblyVersion("2.1.0.002")]
+
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Test/Document/TestBinaryDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Document/TestBinaryDocument.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Document/TestBinaryDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Document/TestBinaryDocument.cs Sat Aug 11 09:56:37 2007
@@ -16,15 +16,17 @@
*/
using System;
+
using NUnit.Framework;
+
using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
-using Document = Lucene.Net.Documents.Document;
-using Field = Lucene.Net.Documents.Field;
using IndexReader = Lucene.Net.Index.IndexReader;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using RAMDirectory = Lucene.Net.Store.RAMDirectory;
+using Fieldable = Lucene.Net.Documents.Fieldable;
+using Field = Lucene.Net.Documents.Field;
-namespace Lucene.Net.Document
+namespace Lucene.Net.Documents
{
/// <summary> Tests {@link Document} class.
@@ -44,10 +46,10 @@
[Test]
public virtual void TestBinaryFieldInIndex()
{
- Field binaryFldStored = new Field("binaryStored", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValStored), Field.Store.YES);
- Field binaryFldCompressed = new Field("binaryCompressed", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValCompressed), Field.Store.COMPRESS);
- Field stringFldStored = new Field("stringStored", binaryValStored, Field.Store.YES, Field.Index.NO, Field.TermVector.NO);
- Field stringFldCompressed = new Field("stringCompressed", binaryValCompressed, Field.Store.COMPRESS, Field.Index.NO, Field.TermVector.NO);
+ Lucene.Net.Documents.Fieldable binaryFldStored = new Field("binaryStored", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValStored), Field.Store.YES);
+ Lucene.Net.Documents.Fieldable binaryFldCompressed = new Field("binaryCompressed", System.Text.UTF8Encoding.UTF8.GetBytes(binaryValCompressed), Field.Store.COMPRESS);
+ Lucene.Net.Documents.Fieldable stringFldStored = new Field("stringStored", binaryValStored, Field.Store.YES, Field.Index.NO, Field.TermVector.NO);
+ Lucene.Net.Documents.Fieldable stringFldCompressed = new Field("stringCompressed", binaryValCompressed, Field.Store.COMPRESS, Field.Index.NO, Field.TermVector.NO);
try
{
@@ -68,6 +70,7 @@
doc.Add(stringFldStored);
doc.Add(stringFldCompressed);
+ /** test for field count */
Assert.AreEqual(4, doc.GetFieldsCount());
/** add the doc to a ram index */
Modified: incubator/lucene.net/trunk/C#/src/Test/Document/TestDateTools.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Document/TestDateTools.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Document/TestDateTools.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Document/TestDateTools.cs Sat Aug 11 09:56:37 2007
@@ -16,10 +16,12 @@
*/
using System;
-using DateTools = Lucene.Net.Documents.DateTools;
+
using NUnit.Framework;
-namespace Lucene.Net.Document
+using DateTools = Lucene.Net.Documents.DateTools;
+
+namespace Lucene.Net.Documents
{
[TestFixture]
public class TestDateTools
Modified: incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Document/TestDocument.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Document/TestDocument.cs Sat Aug 11 09:56:37 2007
@@ -16,20 +16,22 @@
*/
using System;
+
using NUnit.Framework;
+
+using RAMDirectory = Lucene.Net.Store.RAMDirectory;
using StandardAnalyzer = Lucene.Net.Analysis.Standard.StandardAnalyzer;
-using Document = Lucene.Net.Documents.Document;
-using Field = Lucene.Net.Documents.Field;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using Term = Lucene.Net.Index.Term;
-using Hits = Lucene.Net.Search.Hits;
-using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using Query = Lucene.Net.Search.Query;
-using Searcher = Lucene.Net.Search.Searcher;
using TermQuery = Lucene.Net.Search.TermQuery;
-using RAMDirectory = Lucene.Net.Store.RAMDirectory;
+using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+using Searcher = Lucene.Net.Search.Searcher;
+using Hits = Lucene.Net.Search.Hits;
+using Fieldable = Lucene.Net.Documents.Fieldable;
+using Field = Lucene.Net.Documents.Field;
-namespace Lucene.Net.Document
+namespace Lucene.Net.Documents
{
/// <summary> Tests {@link Document} class.
@@ -50,9 +52,9 @@
public virtual void TestBinaryField()
{
Lucene.Net.Documents.Document doc = new Lucene.Net.Documents.Document();
- Field stringFld = new Field("string", binaryVal, Field.Store.YES, Field.Index.NO);
- Field binaryFld = new Field("binary", (new System.Text.ASCIIEncoding()).GetBytes(binaryVal), Field.Store.YES);
- Field binaryFld2 = new Field("binary", (new System.Text.ASCIIEncoding()).GetBytes(binaryVal2), Field.Store.YES);
+ Fieldable stringFld = new Field("string", binaryVal, Field.Store.YES, Field.Index.NO);
+ Fieldable binaryFld = new Field("binary", (new System.Text.ASCIIEncoding()).GetBytes(binaryVal), Field.Store.YES);
+ Fieldable binaryFld2 = new Field("binary", (new System.Text.ASCIIEncoding()).GetBytes(binaryVal2), Field.Store.YES);
doc.Add(stringFld);
doc.Add(binaryFld);
Modified: incubator/lucene.net/trunk/C#/src/Test/Document/TestNumberTools.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Document/TestNumberTools.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Document/TestNumberTools.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Document/TestNumberTools.cs Sat Aug 11 09:56:37 2007
@@ -16,10 +16,12 @@
*/
using System;
-using NumberTools = Lucene.Net.Documents.NumberTools;
+
using NUnit.Framework;
-namespace Lucene.Net.Document
+using NumberTools = Lucene.Net.Documents.NumberTools;
+
+namespace Lucene.Net.Documents
{
[TestFixture]
public class TestNumberTools
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/DocHelper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/DocHelper.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/DocHelper.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/DocHelper.cs Sat Aug 11 09:56:37 2007
@@ -16,10 +16,12 @@
*/
using System;
+
using Analyzer = Lucene.Net.Analysis.Analyzer;
using WhitespaceAnalyzer = Lucene.Net.Analysis.WhitespaceAnalyzer;
using Document = Lucene.Net.Documents.Document;
using Field = Lucene.Net.Documents.Field;
+using Fieldable = Lucene.Net.Documents.Fieldable;
using Similarity = Lucene.Net.Search.Similarity;
using Directory = Lucene.Net.Store.Directory;
@@ -38,7 +40,14 @@
public const System.String TEXT_FIELD_2_KEY = "textField2";
public static Field textField2;
- public const System.String FIELD_3_TEXT = "aaaNoNorms aaaNoNorms bbbNoNorms";
+ public const System.String FIELD_2_COMPRESSED_TEXT = "field field field two text";
+ //Fields will be lexicographically sorted. So, the order is: field, text, two
+ public static readonly int[] COMPRESSED_FIELD_2_FREQS = new int[]{3, 1, 1};
+ public const System.String COMPRESSED_TEXT_FIELD_2_KEY = "compressedTextField2";
+ public static Field compressedTextField2;
+
+
+ public const System.String FIELD_3_TEXT = "aaaNoNorms aaaNoNorms bbbNoNorms";
public const System.String TEXT_FIELD_3_KEY = "textField3";
public static Field textField3;
@@ -63,11 +72,37 @@
public const System.String UNSTORED_FIELD_2_KEY = "unStoredField2";
public static Field unStoredField2;
- public static System.Collections.IDictionary nameValues = null;
+ public const System.String LAZY_FIELD_BINARY_KEY = "lazyFieldBinary";
+ public static byte[] LAZY_FIELD_BINARY_BYTES;
+ public static Field lazyFieldBinary;
+
+ public const System.String LAZY_FIELD_KEY = "lazyField";
+ public const System.String LAZY_FIELD_TEXT = "These are some field bytes";
+ public static Field lazyField;
+
+ public const System.String LARGE_LAZY_FIELD_KEY = "largeLazyField";
+ public static System.String LARGE_LAZY_FIELD_TEXT;
+ public static Field largeLazyField;
+
+ //From Issue 509
+ public const System.String FIELD_UTF1_TEXT = "field one \u4e00text";
+ public const System.String TEXT_FIELD_UTF1_KEY = "textField1Utf8";
+ public static Field textUtfField1;
+
+ public const System.String FIELD_UTF2_TEXT = "field field field \u4e00two text";
+ //Fields will be lexicographically sorted. So, the order is: field, text, two
+ public static readonly int[] FIELD_UTF2_FREQS = new int[]{3, 1, 1};
+ public const System.String TEXT_FIELD_UTF2_KEY = "textField2Utf8";
+ public static Field textUtfField2;
+
+
+
+
+ public static System.Collections.IDictionary nameValues = null;
// ordered list of all the fields...
// could use LinkedHashMap for this purpose if Java1.4 is OK
- public static Field[] fields = new Field[]{textField1, textField2, textField3, keyField, noNormsField, unIndField, unStoredField1, unStoredField2};
+ public static Field[] fields = new Field[]{textField1, textField2, textField3, compressedTextField2, keyField, noNormsField, unIndField, unStoredField1, unStoredField2, textUtfField1, textUtfField2, lazyField, lazyFieldBinary, largeLazyField};
// Map<String fieldName, Field field>
public static System.Collections.IDictionary all = new System.Collections.Hashtable();
@@ -77,10 +112,11 @@
public static System.Collections.IDictionary unindexed = new System.Collections.Hashtable();
public static System.Collections.IDictionary termvector = new System.Collections.Hashtable();
public static System.Collections.IDictionary notermvector = new System.Collections.Hashtable();
+ public static System.Collections.IDictionary lazy = new System.Collections.Hashtable();
public static System.Collections.IDictionary noNorms = new System.Collections.Hashtable();
- private static void Add(System.Collections.IDictionary map, Field field)
+ private static void Add(System.Collections.IDictionary map, Fieldable field)
{
map[field.Name()] = field;
}
@@ -156,16 +192,26 @@
public static int NumFields(Lucene.Net.Documents.Document doc)
{
- int result = 0;
- foreach (Field field in doc.Fields())
- {
- System.String name = field.Name();
- name += ""; // avoid compiler warning
- result++;
- }
- return result;
+ return doc.GetFields().Count;
}
+ /*
+0 textField1,
+1 textField2,
+2 textField3,
+3 compressedTextField2,
+4 keyField,
+5 noNormsField,
+6 unIndField,
+7 unStoredField1,
+8 unStoredField2,
+9 textUtfField1,
+10 textUtfField2,
+11 lazyField,
+12 lazyFieldBinary,
+13 largeLazyField
+ */
+
static DocHelper()
{
textField1 = new Field(TEXT_FIELD_1_KEY, FIELD_1_TEXT, Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.NO);
@@ -177,20 +223,47 @@
{
textField3.SetOmitNorms(true);
}
+ compressedTextField2 = new Field(COMPRESSED_TEXT_FIELD_2_KEY, FIELD_2_COMPRESSED_TEXT, Field.Store.COMPRESS, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ fields[3] = compressedTextField2;
keyField = new Field(KEYWORD_FIELD_KEY, KEYWORD_TEXT, Field.Store.YES, Field.Index.UN_TOKENIZED);
- fields[3] = keyField;
+ fields[4] = keyField;
noNormsField = new Field(NO_NORMS_KEY, NO_NORMS_TEXT, Field.Store.YES, Field.Index.NO_NORMS);
- fields[4] = noNormsField;
+ fields[5] = noNormsField;
unIndField = new Field(UNINDEXED_FIELD_KEY, UNINDEXED_FIELD_TEXT, Field.Store.YES, Field.Index.NO);
- fields[5] = unIndField;
+ fields[6] = unIndField;
unStoredField1 = new Field(UNSTORED_FIELD_1_KEY, UNSTORED_1_FIELD_TEXT, Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO);
- fields[6] = unStoredField1;
+ fields[7] = unStoredField1;
unStoredField2 = new Field(UNSTORED_FIELD_2_KEY, UNSTORED_2_FIELD_TEXT, Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.YES);
- fields[7] = unStoredField2;
+ fields[8] = unStoredField2;
+ textUtfField1 = new Field(TEXT_FIELD_UTF1_KEY, FIELD_UTF1_TEXT, Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.NO);
+ fields[9] = textUtfField1;
+ textUtfField2 = new Field(TEXT_FIELD_UTF2_KEY, FIELD_UTF2_TEXT, Field.Store.YES, Field.Index.TOKENIZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ fields[10] = textUtfField2;
+ lazyField = new Field(LAZY_FIELD_KEY, LAZY_FIELD_TEXT, Field.Store.YES, Field.Index.TOKENIZED);
+ fields[11] = lazyField;
{
+ //Initialize the large Lazy Field
+ System.Text.StringBuilder buffer = new System.Text.StringBuilder();
+ for (int i = 0; i < 10000; i++)
+ {
+ buffer.Append("Lazily loading lengths of language in lieu of laughing ");
+ }
+
+ try
+ {
+ LAZY_FIELD_BINARY_BYTES = System.Text.Encoding.GetEncoding("UTF8").GetBytes("These are some binary field bytes");
+ }
+ catch (System.IO.IOException e)
+ {
+ }
+ lazyFieldBinary = new Field(LAZY_FIELD_BINARY_KEY, LAZY_FIELD_BINARY_BYTES, Field.Store.YES);
+ fields[fields.Length - 2] = lazyFieldBinary;
+ LARGE_LAZY_FIELD_TEXT = buffer.ToString();
+ largeLazyField = new Field(LARGE_LAZY_FIELD_KEY, LARGE_LAZY_FIELD_TEXT, Field.Store.YES, Field.Index.TOKENIZED);
+ fields[fields.Length - 1] = largeLazyField;
for (int i = 0; i < fields.Length; i++)
{
- Field f = fields[i];
+ Fieldable f = fields[i];
Add(all, f);
if (f.IsIndexed())
Add(indexed, f);
@@ -206,18 +279,26 @@
Add(unstored, f);
if (f.GetOmitNorms())
Add(noNorms, f);
- }
+ if (f.IsLazy())
+ Add(lazy, f);
+ }
}
{
- nameValues = new System.Collections.Hashtable();
- nameValues[TEXT_FIELD_1_KEY] = FIELD_1_TEXT;
- nameValues[TEXT_FIELD_2_KEY] = FIELD_2_TEXT;
- nameValues[TEXT_FIELD_3_KEY] = FIELD_3_TEXT;
- nameValues[KEYWORD_FIELD_KEY] = KEYWORD_TEXT;
- nameValues[NO_NORMS_KEY] = NO_NORMS_TEXT;
- nameValues[UNINDEXED_FIELD_KEY] = UNINDEXED_FIELD_TEXT;
- nameValues[UNSTORED_FIELD_1_KEY] = UNSTORED_1_FIELD_TEXT;
- nameValues[UNSTORED_FIELD_2_KEY] = UNSTORED_2_FIELD_TEXT;
+ nameValues = new System.Collections.Hashtable();
+ nameValues[TEXT_FIELD_1_KEY] = FIELD_1_TEXT;
+ nameValues[TEXT_FIELD_2_KEY] = FIELD_2_TEXT;
+ nameValues[COMPRESSED_TEXT_FIELD_2_KEY] = FIELD_2_COMPRESSED_TEXT;
+ nameValues[TEXT_FIELD_3_KEY] = FIELD_3_TEXT;
+ nameValues[KEYWORD_FIELD_KEY] = KEYWORD_TEXT;
+ nameValues[NO_NORMS_KEY] = NO_NORMS_TEXT;
+ nameValues[UNINDEXED_FIELD_KEY] = UNINDEXED_FIELD_TEXT;
+ nameValues[UNSTORED_FIELD_1_KEY] = UNSTORED_1_FIELD_TEXT;
+ nameValues[UNSTORED_FIELD_2_KEY] = UNSTORED_2_FIELD_TEXT;
+ nameValues[LAZY_FIELD_KEY] = LAZY_FIELD_TEXT;
+ nameValues[LAZY_FIELD_BINARY_KEY] = LAZY_FIELD_BINARY_BYTES;
+ nameValues[LARGE_LAZY_FIELD_KEY] = LARGE_LAZY_FIELD_TEXT;
+ nameValues[TEXT_FIELD_UTF1_KEY] = FIELD_UTF1_TEXT;
+ nameValues[TEXT_FIELD_UTF2_KEY] = FIELD_UTF2_TEXT;
}
}
}
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/MockIndexInput.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/MockIndexInput.cs?view=diff&rev=564939&r1=564938&r2=564939
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/MockIndexInput.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/MockIndexInput.cs Sat Aug 11 09:56:37 2007
@@ -16,6 +16,7 @@
*/
using System;
+
using BufferedIndexInput = Lucene.Net.Store.BufferedIndexInput;
namespace Lucene.Net.Index