* Started on converting UserHTTPServer to BaseHttpServer

* Added a 'param' param to the RestMethod
* Added RestHandlerEntry to store more info about the 'rest' handler

2 files changed, 31 insertions, 7 deletions

diff --git a/OpenSim.Servers/BaseHttpServer.cs b/OpenSim.Servers/BaseHttpServer.cs
index 2f73f46..0a123b7 100644
--- a/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim.Servers/BaseHttpServer.cs
@@ -12,9 +12,30 @@ namespace OpenSim.Servers
 {

     public class BaseHttpServer

     {

+        protected class RestMethodEntry

+        {

+            private string m_path;

+            public string Path

+            {

+                get { return m_path; }

+            }

+

+            private RestMethod m_restMethod;

+            public RestMethod RestMethod

+            {

+                get { return m_restMethod; }

+            }

+        

+            public RestMethodEntry( string path, RestMethod restMethod )

+            {

+                m_path = path;

+                m_restMethod = restMethod;

+            }

+        }

+        

         protected Thread m_workerThread;

         protected HttpListener m_httpListener;

-        protected Dictionary<string, RestMethod> m_restHandlers = new Dictionary<string, RestMethod>();

+        protected Dictionary<string, RestMethodEntry> m_restHandlers = new Dictionary<string, RestMethodEntry>();

         protected Dictionary<string, XmlRpcMethod> m_rpcHandlers = new Dictionary<string, XmlRpcMethod>();

         protected int m_port;

 

@@ -29,7 +50,7 @@ namespace OpenSim.Servers
                 

             if (!this.m_restHandlers.ContainsKey(methodKey))

             {

-                this.m_restHandlers.Add(methodKey, handler);

+                this.m_restHandlers.Add(methodKey, new RestMethodEntry( path, handler ));

                 return true;

             }

 

@@ -74,7 +95,6 @@ namespace OpenSim.Servers
         protected virtual string ParseREST(string request, string path, string method)

         {

             string response;

-            RestMethod handler;

             

             string requestKey = String.Format("{0}: {1}", method, path);

                     

@@ -89,10 +109,14 @@ namespace OpenSim.Servers
                     }

                 }

             }

-            

-            if (m_restHandlers.TryGetValue(bestMatch, out handler))

+

+            RestMethodEntry restMethodEntry;

+            if (m_restHandlers.TryGetValue(bestMatch, out restMethodEntry))

             {

-                response = handler(request, path);

+                RestMethod restMethod = restMethodEntry.RestMethod;

+

+                string param = path.Substring( restMethodEntry.Path.Length );

+                response = restMethod(request, path, param);

             

             }

             else

diff --git a/OpenSim.Servers/IRestHandler.cs b/OpenSim.Servers/IRestHandler.cs
index 08737cc..c322505 100644
--- a/OpenSim.Servers/IRestHandler.cs
+++ b/OpenSim.Servers/IRestHandler.cs
@@ -4,5 +4,5 @@ using System.Text;
 

 namespace OpenSim.Servers

 {

-    public delegate string RestMethod( string request, string path );

+    public delegate string RestMethod( string request, string path, string param );

 }