beagle r4518 - in branches/beagle-lucene2_1/beagled/Lucene.Net: Analysis/Standard QueryParser upstream-changes

[dbera svn gnome org]

Author: dbera
Date: Sat Feb 23 00:46:43 2008
New Revision: 4518
URL: http://svn.gnome.org/viewvc/beagle?rev=4518&view=rev

Log:
Add old patch 17_remove_debugstreams.patch


Added:
   branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/09_remove_debugstreams.patch
Modified:
   branches/beagle-lucene2_1/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs
   branches/beagle-lucene2_1/beagled/Lucene.Net/QueryParser/QueryParserTokenManager.cs

Modified: branches/beagle-lucene2_1/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs
==============================================================================
--- branches/beagle-lucene2_1/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs	(original)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs	Sat Feb 23 00:46:43 2008
@@ -26,21 +26,11 @@
         /// <summary>By default, closes the input Reader. </summary>
         public void Close()
         { 
-            debugStream.Close(); 
             input_stream.Done(); 
         }
 
         private void  InitBlock()
 		{
-			System.IO.StreamWriter temp_writer;
-			temp_writer = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding);
-			temp_writer.AutoFlush = true;
-			debugStream = temp_writer;
-		}
-		public System.IO.StreamWriter debugStream;
-		public virtual void  SetDebugStream(System.IO.StreamWriter ds)
-		{
-			debugStream = ds;
 		}
 		private int JjMoveStringLiteralDfa0_0()
 		{

Modified: branches/beagle-lucene2_1/beagled/Lucene.Net/QueryParser/QueryParserTokenManager.cs
==============================================================================
--- branches/beagle-lucene2_1/beagled/Lucene.Net/QueryParser/QueryParserTokenManager.cs	(original)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/QueryParser/QueryParserTokenManager.cs	Sat Feb 23 00:46:43 2008
@@ -33,15 +33,6 @@
 	{
 		private void  InitBlock()
 		{
-			System.IO.StreamWriter temp_writer;
-			temp_writer = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding);
-			temp_writer.AutoFlush = true;
-			debugStream = temp_writer;
-		}
-		public System.IO.StreamWriter debugStream;
-		public virtual void  SetDebugStream(System.IO.StreamWriter ds)
-		{
-			debugStream = ds;
 		}
 		private int JjStopStringLiteralDfa_3(int pos, long active0)
 		{
@@ -1408,4 +1399,4 @@
 			}
 		}
 	}
-}
\ No newline at end of file
+}

Added: branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/09_remove_debugstreams.patch
==============================================================================
--- (empty file)
+++ branches/beagle-lucene2_1/beagled/Lucene.Net/upstream-changes/09_remove_debugstreams.patch	Sat Feb 23 00:46:43 2008
@@ -0,0 +1,61 @@
+From: Joe Shaw <joeshaw novell com>
+
+Remove instances of debugStream from throughout the code.  They unnecessarily
+open stdout (which causes the creation of a "Console" log file), but they're
+never actually used.
+
+Index: QueryParser/QueryParserTokenManager.cs
+===================================================================
+--- QueryParser/QueryParserTokenManager.cs	(revision 4506)
++++ QueryParser/QueryParserTokenManager.cs	(working copy)
+@@ -33,16 +33,7 @@
+ 	{
+ 		private void  InitBlock()
+ 		{
+-			System.IO.StreamWriter temp_writer;
+-			temp_writer = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding);
+-			temp_writer.AutoFlush = true;
+-			debugStream = temp_writer;
+ 		}
+-		public System.IO.StreamWriter debugStream;
+-		public virtual void  SetDebugStream(System.IO.StreamWriter ds)
+-		{
+-			debugStream = ds;
+-		}
+ 		private int JjStopStringLiteralDfa_3(int pos, long active0)
+ 		{
+ 			switch (pos)
+@@ -1408,4 +1399,4 @@
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+Index: Analysis/Standard/StandardTokenizerTokenManager.cs
+===================================================================
+--- Analysis/Standard/StandardTokenizerTokenManager.cs	(revision 4515)
++++ Analysis/Standard/StandardTokenizerTokenManager.cs	(working copy)
+@@ -26,22 +26,12 @@
+         /// <summary>By default, closes the input Reader. </summary>
+         public void Close()
+         { 
+-            debugStream.Close(); 
+             input_stream.Done(); 
+         }
+ 
+         private void  InitBlock()
+ 		{
+-			System.IO.StreamWriter temp_writer;
+-			temp_writer = new System.IO.StreamWriter(System.Console.OpenStandardOutput(), System.Console.Out.Encoding);
+-			temp_writer.AutoFlush = true;
+-			debugStream = temp_writer;
+ 		}
+-		public System.IO.StreamWriter debugStream;
+-		public virtual void  SetDebugStream(System.IO.StreamWriter ds)
+-		{
+-			debugStream = ds;
+-		}
+ 		private int JjMoveStringLiteralDfa0_0()
+ 		{
+ 			return JjMoveNfa_0(0, 0);