lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aro...@apache.org
Subject svn commit: r490511 [1/3] - in /incubator/lucene.net/trunk/C#/src: ./ Demo/DeleteFiles/ Demo/DemoLib/ Demo/DemoLib/HTML/ Demo/IndexFiles/ Demo/IndexHtml/ Demo/SearchFiles/ Lucene.Net/ Lucene.Net/Index/ Lucene.Net/Store/ Test/ Test/Search/
Date Wed, 27 Dec 2006 15:13:51 GMT
Author: aroush
Date: Wed Dec 27 07:13:49 2006
New Revision: 490511

URL: http://svn.apache.org/viewvc?view=rev&rev=490511
Log:
Release of Lucene.Net.2.0 build 003 "Final".

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/DemoLib/HTML/HTMLParser.cs
    incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs
    incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs
    incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Token.cs
    incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.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/IndexHtml/IndexHtml.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/AssemblyInfo.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Lucene.Net.xml
    incubator/lucene.net/trunk/C#/src/Lucene.Net/Store/FSDirectory.cs
    incubator/lucene.net/trunk/C#/src/Test/AssemblyInfo.cs
    incubator/lucene.net/trunk/C#/src/Test/Search/TestSort.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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DeleteFiles/AssemblyInfo.cs Wed Dec 27 07:13:49
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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/AssemblyInfo.cs Wed Dec 27 07:13:49 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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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/HTML/HTMLParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParser.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParser.cs Wed Dec 27 07:13:49
2006
@@ -37,6 +37,7 @@
 		internal System.String currentMetaContent = null;
 		internal int length = 0;
 		internal bool titleComplete = false;
+        internal bool summaryComplete = false;
 		internal bool inTitle = false;
 		internal bool inMetaTag = false;
 		internal bool inStyle = false;
@@ -64,20 +65,19 @@
 				
 			}
 			
-            // {{Aroush}} -- fix me
 			//public MyPipedInputStream(HTMLParser enclosingInstance) : base()
 			//{
 			//	InitBlock(enclosingInstance);
 			//}
 			
-			public MyPipedInputStream(HTMLParser enclosingInstance, System.IO.StreamWriter src) :
base(src.BaseStream)
+			public MyPipedInputStream(HTMLParser enclosingInstance, System.IO.StreamReader src) :
base(src.BaseStream)
 			{
 				InitBlock(enclosingInstance);
 			}
 			
 			public virtual bool Full()
 			{
-				return true; // return this.available() >= PipedInputStream.PIPE_SIZE; // {{Aroush}}
-- fix me. 
+                return enclosingInstance.summaryComplete;
 			}
 		}
 		
@@ -142,10 +142,10 @@
 		{
 			if (pipeIn == null)
 			{
-				pipeInStream = null; // pipeInStream = new MyPipedInputStream(this);    // {{Aroush-1.9}}
-- fix me. 
+                pipeInStream = new MyPipedInputStream(this, new System.IO.StreamReader(new
System.IO.MemoryStream(1024)));
 				pipeOutStream = new System.IO.StreamWriter(pipeInStream.BaseStream);
-				pipeIn = new System.IO.StreamReader(pipeInStream.BaseStream, System.Text.Encoding.GetEncoding("UTF-16BE"));
-				pipeOut = new System.IO.StreamWriter(pipeOutStream.BaseStream, System.Text.Encoding.GetEncoding("UTF-16BE"));
+				pipeIn = new System.IO.StreamReader(pipeInStream.BaseStream, System.Text.Encoding.Default);
// GetEncoding("UTF-16BE"));
+				pipeOut = new System.IO.StreamWriter(pipeOutStream.BaseStream, System.Text.Encoding.Default);
// GetEncoding("UTF-16BE"));
 				
 				SupportClass.ThreadClass thread = new ParserThread(this);
 				thread.Start(); // start parsing
@@ -163,6 +163,7 @@
 				{
 					lock (this)
 					{
+                        summaryComplete = true;
 						System.Threading.Monitor.PulseAll(this);
 					}
 				}
@@ -984,7 +985,7 @@
 							case 0:  Jj_3_1(); break;
 							
 							case 1:  Jj_3_2(); break;
-							}
+						}
 					}
 					p = p.next;
 				}

Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/HTMLParserTokenManager.cs Wed Dec
27 07:13:49 2006
@@ -1100,7 +1100,7 @@
 					ReInitRounds();
 				if (curChar < 64)
 				{
-					ulong l = ((ulong) 1L) << curChar;
+					ulong l = ((ulong) 1L) << (int) curChar;
 MatchLoop1: 
 					do 
 					{
@@ -1851,7 +1851,7 @@
 		
 		protected internal virtual Token JjFillToken()
 		{
-			Token t = Token.newToken(jjmatchedKind);
+			Token t = Token.NewToken(jjmatchedKind);
 			t.kind = jjmatchedKind;
 			System.String im = jjstrLiteralImages[jjmatchedKind];
 			t.image = (im == null)?input_stream.GetImage():im;

Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/ParserThread.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/ParserThread.cs Wed Dec 27 07:13:49
2006
@@ -48,10 +48,11 @@
 				}
 				finally
 				{
-					parser.pipeOut.Close();
+					//parser.pipeOut.Close();
 					lock (parser)
 					{
 						parser.summary.Length = HTMLParser.SUMMARY_LENGTH;
+                        parser.summaryComplete = true;
 						parser.titleComplete = true;
 						System.Threading.Monitor.PulseAll(parser);
 					}

Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Token.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/Token.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Token.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/Token.cs Wed Dec 27 07:13:49 2006
@@ -80,7 +80,7 @@
 		/// to the following switch statement. Then you can cast matchedToken
 		/// variable to the appropriate type and use it in your lexical actions.
 		/// </summary>
-		public static Token newToken(int ofKind)
+		public static Token NewToken(int ofKind)
 		{
 			switch (ofKind)
 			{

Modified: incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/DemoLib/HTML/TokenMgrError.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/DemoLib/HTML/TokenMgrError.cs Wed Dec 27 07:13:49
2006
@@ -64,7 +64,7 @@
 		/// <summary> Replaces unprintable characters by their espaced (or unicode escaped)
 		/// equivalents in the given string
 		/// </summary>
-		protected internal static System.String addEscapes(System.String str)
+		protected internal static System.String AddEscapes(System.String str)
 		{
 			System.Text.StringBuilder retval = new System.Text.StringBuilder();
 			char ch;
@@ -138,7 +138,7 @@
 		/// </summary>
 		protected internal static System.String LexicalError(bool EOFSeen, int lexState, int errorLine,
int errorColumn, System.String errorAfter, char curChar)
 		{
-			return ("Lexical error at line " + errorLine + ", column " + errorColumn + ".  Encountered:
" + (EOFSeen?"<EOF> ":("\"" + addEscapes(System.Convert.ToString(curChar)) + "\"") +
" (" + (int) curChar + "), ") + "after : \"" + addEscapes(errorAfter) + "\"");
+			return ("Lexical error at line " + errorLine + ", column " + errorColumn + ".  Encountered:
" + (EOFSeen?"<EOF> ":("\"" + AddEscapes(System.Convert.ToString(curChar)) + "\"") +
" (" + (int) curChar + "), ") + "after : \"" + AddEscapes(errorAfter) + "\"");
 		}
 		
 		/*

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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexFiles/AssemblyInfo.cs Wed Dec 27 07:13:49
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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/AssemblyInfo.cs Wed Dec 27 07:13:49 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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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/IndexHtml.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Demo/IndexHtml/IndexHtml.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/IndexHtml/IndexHtml.cs Wed Dec 27 07:13:49 2006
@@ -149,7 +149,7 @@
 				System.Array.Sort(files); // sort the files
 				for (int i = 0; i < files.Length; i++)
 				// recursively index them
-					IndexDocs(new System.IO.FileInfo(file.FullName + "\\" + files[i]));
+					IndexDocs(new System.IO.FileInfo(files[i]));
 			}
 			else if (file.FullName.EndsWith(".html") || file.FullName.EndsWith(".htm") || file.FullName.EndsWith(".txt"))
 			{

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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Demo/SearchFiles/AssemblyInfo.cs Wed Dec 27 07:13:49
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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/HISTORY.txt (original)
+++ incubator/lucene.net/trunk/C#/src/HISTORY.txt Wed Dec 27 07:13:49 2006
@@ -1,10 +1,15 @@
 Lucene.Net History
 ------------------
 
+27Dec06:
+	- Release:  Lucene.Net.2.0 build 003 "final"
+	- Fix: Lucene.Net.Search.TestSort.TestInternationalMultiSearcherSort -- NUnit test now passes
+	- Fix: Lucene.Net.Search.TestSort.TestInternationalSort -- NUnit test now passes
+
 
 27Nov06:
 	- Release:  Lucene.Net.2.0 build 002 "Beta"
-	- Lucene.Net.Demo.SearchFiles.cs -- parted new code
+	- Lucene.Net.Demo.SearchFiles.cs -- ported new code
 	- Lucene.Net.Index.SegmentReader.Get() -- changed Exception to SystemException
 	- Lucene.Net.Search.StringIndex.cs -- added a Close() method (to fix sort memory leak defect)
 	- Lucene.Net.Search.FieldCacheImpl.cs -- added a Close() method (to fix sort memory leak
defect)

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=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/AssemblyInfo.cs Wed Dec 27 07:13:49 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("2.0.0.002")]
+[assembly: AssemblyVersion("2.0.0.003")]
 
 //
 // 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/FieldInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/C%23/src/Lucene.Net/Index/FieldInfo.cs?view=diff&rev=490511&r1=490510&r2=490511
==============================================================================
--- incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs (original)
+++ incubator/lucene.net/trunk/C#/src/Lucene.Net/Index/FieldInfo.cs Wed Dec 27 07:13:49 2006
@@ -32,7 +32,7 @@
 		
 		public /*internal*/ bool omitNorms; // omit norms associated with indexed fields
 		
-        public bool IsIndexed()     // {{Aroush-2.0}} remove this function
+        public bool IsIndexed()
         {
             return isIndexed;
         }



Mime
View raw message