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 2006/06/14 05:27:24 UTC
svn commit: r414038 - in /incubator/lucene.net/trunk/C#/src: ./ Lucene.Net/
Lucene.Net/Index/ Lucene.Net/Search/ Test/ Test/Index/ Test/Search/
Author: aroush
Date: Tue Jun 13 20:27:23 2006
New Revision: 414038
URL: http://svn.apache.org/viewvc?rev=414038&view=rev
Log:
Lucene.Net 1.9 Build 004
Modified:
incubator/lucene.net/trunk/C#/src/HISTORY.txt
incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiReader.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/FieldCacheImpl.cs
incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs
incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs
incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs
incubator/lucene.net/trunk/C#/src/Test/Test.csproj
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=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/HISTORY.txt (original)
+++ incubator/lucene.net/trunk/C#/src/HISTORY.txt Tue Jun 13 20:27:23 2006
@@ -1,9 +1,16 @@
Lucene.Net History
------------------
+13Jun06:
+ - Release: Lucene.Net.1.9 RC1 build 004 Beta
+ - Fix: Lucene.Net.Search.FieldCacheImpl.GetFloats() -- must remove 'f" or "F" for System.Single.Parse() to work
+ - Fix: Lucene.Net.Index.GetFieldnames() -- was storing the object instead the value in the object
+ - Fix: Test.Lucene.Net.Index.CollectionContains() -- need to compare strings, not objects
+ - Fix: Test.Lucene.Net.Serch.TestKnownSetOfDocuments() -- don't fail if an item doesn't exist
+
03Jun06:
- - Release Lucene.Net.1.9 RC1 build 003 Alpha
+ - Release: Lucene.Net.1.9 RC1 build 003 Alpha
- Note: This is the first release of Lucene.Net 1.9 to SVN
- Note: Added ZIP compression support via reflection. Thanks to Eyal Post
- Note: Fixed bugs in the code which were expose via the NUnit "Test" code
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=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs Tue Jun 13 20:27:23 2006
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.0.003")]
+[assembly: AssemblyVersion("1.9.0.004")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/MultiReader.cs?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/MultiReader.cs Tue Jun 13 20:27:23 2006
@@ -327,11 +327,13 @@
{
IndexReader reader = subReaders[i];
System.Collections.ICollection names = reader.GetIndexedFieldNames(tvSpec);
- foreach (object item in names)
+ for (System.Collections.IEnumerator iterator = names.GetEnumerator(); iterator.MoveNext(); )
{
- if (fieldSet.ContainsKey(item) == false)
+ System.Collections.DictionaryEntry fi = (System.Collections.DictionaryEntry) iterator.Current;
+ System.String s = fi.Key.ToString();
+ if (fieldSet.ContainsKey(s) == false)
{
- fieldSet.Add(item, item);
+ fieldSet.Add(s, s);
}
}
}
@@ -348,11 +350,13 @@
{
IndexReader reader = subReaders[i];
System.Collections.ICollection names = reader.GetFieldNames(fieldNames);
- foreach (object item in names)
+ for (System.Collections.IEnumerator iterator = names.GetEnumerator(); iterator.MoveNext(); )
{
- if (fieldSet.ContainsKey(item) == false)
+ System.Collections.DictionaryEntry fi = (System.Collections.DictionaryEntry) iterator.Current;
+ System.String s = fi.Key.ToString();
+ if (fieldSet.ContainsKey(s) == false)
{
- fieldSet.Add(item, item);
+ fieldSet.Add(s, s);
}
}
}
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=414038&r1=414037&r2=414038&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 Jun 13 20:27:23 2006
@@ -255,7 +255,15 @@
Term term = termEnum.Term();
if (term.Field() != field)
break;
- float termval = parser.ParseFloat(term.Text());
+ float termval;
+ try
+ {
+ termval = SupportClass.Single.Parse(term.Text());
+ }
+ catch (Exception e)
+ {
+ termval = 0;
+ }
termDocs.Seek(termEnum);
while (termDocs.Next())
{
Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/ParallelMultiSearcher.cs?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/ParallelMultiSearcher.cs Tue Jun 13 20:27:23 2006
@@ -255,7 +255,7 @@
{
try
{
- docs = (sort == null)?searchable.Search(weight, filter, nDocs):searchable.Search(weight, filter, nDocs, sort);
+ docs = (sort == null) ? searchable.Search(weight, filter, nDocs) : searchable.Search(weight, filter, nDocs, sort);
}
// Store the IOException for later use by the caller of this thread
catch (System.IO.IOException ioe)
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?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs Tue Jun 13 20:27:23 2006
@@ -26,7 +26,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.9.0.003")]
+[assembly: AssemblyVersion("1.9.0.004")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
Modified: incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Index/TestIndexReader.cs?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Index/TestIndexReader.cs Tue Jun 13 20:27:23 2006
@@ -156,9 +156,13 @@
public static bool CollectionContains(System.Collections.ICollection col, System.String val)
{
- foreach (object item in col)
- if (item.ToString() == val)
+ for (System.Collections.IEnumerator iterator = col.GetEnumerator(); iterator.MoveNext(); )
+ {
+ System.Collections.DictionaryEntry fi = (System.Collections.DictionaryEntry) iterator.Current;
+ System.String s = fi.Key.ToString();
+ if (s == val)
return true;
+ }
return false;
}
@@ -324,7 +328,7 @@
private Directory GetDirectory(bool create)
{
- return FSDirectory.GetDirectory(System.IO.Path.Combine(System.Configuration.ConfigurationSettings.AppSettings.Get("tempDir"), "testIndex"), create);
+ return FSDirectory.GetDirectory(System.IO.Path.Combine(SupportClass.AppSettings.Get("tempDir", ""), "testIndex"), create);
}
[Test]
Modified: incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Search/TestTermVectors.cs?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Search/TestTermVectors.cs Tue Jun 13 20:27:23 2006
@@ -300,9 +300,16 @@
//System.out.println("Term: " + term);
int freq = freqs2[i];
Assert.IsTrue(test4.IndexOf(term) != - 1);
- System.Int32 freqInt = (System.Int32) test4Map[term];
- Assert.IsTrue(false); // Assert.IsTrue(freqInt != null); // {{Aroush}} how do we test for 'null'?
- Assert.IsTrue(freqInt == freq);
+ System.Int32 freqInt = -1;
+ try
+ {
+ freqInt = (System.Int32) test4Map[term];
+ }
+ catch (Exception)
+ {
+ Assert.IsTrue(false);
+ }
+ Assert.IsTrue(freqInt == freq);
}
knownSearcher.Close();
}
Modified: incubator/lucene.net/trunk/C#/src/Test/Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Test/Test.csproj?rev=414038&r1=414037&r2=414038&view=diff
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Test/Test.csproj (original)
+++ incubator/lucene.net/trunk/C#/src/Test/Test.csproj Tue Jun 13 20:27:23 2006
@@ -121,14 +121,14 @@
AssemblyFolderKey = "hklm\dn\nunit.framework"
/>
<Reference
- Name = "Lucene.Net"
- AssemblyName = "Lucene.Net"
- HintPath = "..\Lucene.Net\bin\Debug\Lucene.Net.dll"
- />
- <Reference
Name = "DemoLib"
AssemblyName = "DemoLib"
HintPath = "..\Demo\DemoLib\bin\Debug\DemoLib.dll"
+ />
+ <Reference
+ Name = "Lucene.Net"
+ AssemblyName = "Lucene.Net"
+ HintPath = "..\Lucene.Net\bin\Debug\Lucene.Net.dll"
/>
</References>
</Build>