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/09/30 05:39:04 UTC

svn commit: r451530 - in /incubator/lucene.net/trunk/C#/src/Lucene.Net: Search/MultiSearcher.cs Search/Query.cs SharpZipLibAdapter.cs Store/FSDirectory.cs

Author: aroush
Date: Fri Sep 29 20:39:04 2006
New Revision: 451530

URL: http://svn.apache.org/viewvc?view=rev&rev=451530
Log:
Lucene.Net.Index.Compression.SharpZipLibAdapter -- provide full name-space to ICompressionAdapter
Lucene.Net.Store.FSDirectory.RenameFile() -- added a missing while loop
Lucene.Net.Store.MultiSearcher.CreateWeight() -- wasn't iterating over the term keys correctly
Lucene.Net.Search.Query.Combine() -- wasn't checking for the right key before adding

Modified:
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Query.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/SharpZipLibAdapter.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/MultiSearcher.cs?view=diff&rev=451530&r1=451529&r2=451530
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/MultiSearcher.cs Fri Sep 29 20:39:04 2006
@@ -361,7 +361,7 @@
 			// step3
 			Term[] allTermsArray = new Term[terms.Count];
             int index = 0;
-            System.Collections.IEnumerator e = terms.GetEnumerator();
+            System.Collections.IEnumerator e = terms.Keys.GetEnumerator();
             while (e.MoveNext())
                 allTermsArray[index++] = e.Current as Term;
 			int[] aggregatedDfs = new int[terms.Count];

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Query.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Search/Query.cs?view=diff&rev=451530&r1=451529&r2=451530
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Query.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Search/Query.cs Fri Sep 29 20:39:04 2006
@@ -148,7 +148,7 @@
 					for (int j = 0; j < clauses.Length; j++)
 					{
                         Query tmp = clauses[j].GetQuery();
-                        if (uniques.Contains(query) == false)
+                        if (uniques.Contains(tmp) == false)
                         {
                             uniques.Add(tmp, tmp);
                         }

Modified: incubator/lucene.net/trunk/C#/src/Lucene.Net/SharpZipLibAdapter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/SharpZipLibAdapter.cs?view=diff&rev=451530&r1=451529&r2=451530
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/SharpZipLibAdapter.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/SharpZipLibAdapter.cs Fri Sep 29 20:39:04 2006
@@ -33,7 +33,7 @@
 
 namespace Lucene.Net.Index.Compression
 {
-    public class SharpZipLibAdapter : ICompressionAdapter
+    public class SharpZipLibAdapter : SupportClass.CompressionSupport.ICompressionAdapter
     {
         public byte[] Compress(byte[] input)
         {

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=451530&r1=451529&r2=451530
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs Fri Sep 29 20:39:04 2006
@@ -483,9 +483,11 @@
 						{
 							buffer = new byte[1024];
 						}
-						int len;
-                        len = in_Renamed.Read(buffer, 0, buffer.Length);
-                        out_Renamed.Write(buffer, 0, len);
+						int len; 
+						while ((len = in_Renamed.Read(buffer, 0, buffer.Length)) > 0) 
+						{ 
+							out_Renamed.Write(buffer, 0, len); 
+						}
 						
 						// delete the old file.
 						bool tmpBool3;