beagle r4627 - in trunk/beagle: BeagleClient BeagleClient/generated beagled

[dbera svn gnome org]

Author: dbera
Date: Fri Mar 21 02:09:13 2008
New Revision: 4627
URL: http://svn.gnome.org/viewvc/beagle?rev=4627&view=rev

Log:
Add a method to Transport to tell it to use old style serializers. This can be used by 'clients' that send/recv messages not defined in BeagleClient e.g. RemoteIndexer.cs
Add a few more types to the list of generated serializers.


Modified:
   trunk/beagle/BeagleClient/Transport.cs
   trunk/beagle/BeagleClient/generated/Makefile
   trunk/beagle/beagled/RemoteIndexer.cs

Modified: trunk/beagle/BeagleClient/Transport.cs
==============================================================================
--- trunk/beagle/BeagleClient/Transport.cs	(original)
+++ trunk/beagle/BeagleClient/Transport.cs	Fri Mar 21 02:09:13 2008
@@ -62,6 +62,18 @@
 		}
 #endif
 
+		// This should be called by any Client class which needs to send/receive messages that are not defined
+		// in BeagleClient's Beagle.dll assembly. Server classes (like one side of beagled and indexhelper) need
+		// not call this since Server.cs has its own serializer.
+		// Currently RemoteIndexer calls this.
+		public static void SetLegacySerializers ()
+		{
+			req_serializer = new XmlSerializer (typeof (RequestWrapper), RequestMessage.Types);
+			resp_serializer = new XmlSerializer (typeof (ResponseWrapper), ResponseMessage.Types);
+		}
+
+		//////////////////////////////////////////////////////////////
+
 		private bool local = false;
 
 		private MemoryStream buffer_stream = new MemoryStream ();

Modified: trunk/beagle/BeagleClient/generated/Makefile
==============================================================================
--- trunk/beagle/BeagleClient/generated/Makefile	(original)
+++ trunk/beagle/BeagleClient/generated/Makefile	Fri Mar 21 02:09:13 2008
@@ -21,7 +21,9 @@
 	Beagle.SnippetResponse			\
 	Beagle.CountMatchQueryResponse		\
 	Beagle.Hit				\
-	Beagle.Indexable
+	Beagle.Indexable			\
+	Beagle.RequestWrapper			\
+	Beagle.ResponseWrapper
 
 TYPES_SGEN_PARAMS = $(TYPES:%=--type:%)
 

Modified: trunk/beagle/beagled/RemoteIndexer.cs
==============================================================================
--- trunk/beagle/beagled/RemoteIndexer.cs	(original)
+++ trunk/beagle/beagled/RemoteIndexer.cs	Fri Mar 21 02:09:13 2008
@@ -55,6 +55,9 @@
 			if (! File.Exists (helper_path))
 				throw new Exception ("Could not find " + helper_path);
 			Logger.Log.Debug ("Found index helper at {0}", helper_path);
+
+			// Beagled acts as a client here but sends message that is not defined in BeagleClient
+			Transport.SetLegacySerializers ();
 		}
 
 		static public IIndexer NewRemoteIndexer (string name, int minor_version)