Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.

Implement the fetch operations fully. Rename one last UserService file to
UserAccountService

3 files changed, 71 insertions, 34 deletions

diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
index d4b906a..46313d9 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
@@ -186,7 +186,7 @@ namespace OpenSim.Services.Connectors
             return accounts;
         }
 
-        public bool SetUserAccount(UserAccount data)
+        public bool StoreUserAccount(UserAccount data)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
             //sendData["SCOPEID"] = scopeID.ToString();
@@ -199,19 +199,6 @@ namespace OpenSim.Services.Connectors
             return SendAndGetBoolReply(sendData);
         }
 
-        public bool CreateUserAccount(UserAccount data)
-        {
-            Dictionary<string, object> sendData = new Dictionary<string, object>();
-            //sendData["SCOPEID"] = scopeID.ToString();
-            sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
-            sendData["VERSIONMAX"] = ProtocolVersions.ClientProtocolVersionMax.ToString();
-            sendData["METHOD"] = "createaccount";
-
-            sendData["account"] = data.ToKeyValuePairs();
-
-            return SendAndGetBoolReply(sendData);
-        }
-
         private UserAccount SendAndGetReply(Dictionary<string, object> sendData)
         {
             string reply = string.Empty;
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs
index 1bdaaab..b2d5d48 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserAccountService.cs
@@ -95,11 +95,9 @@ namespace OpenSim.Services.Interfaces
         //
         List<UserAccount> GetUserAccounts(UUID scopeID, string query);
 
-        // Update all updatable fields
+        // Store the data given, wich replaces the sotred data, therefore
+        // must be complete.
         //
-        bool SetUserAccount(UserAccount data);
-        
-        // Creates a user data record
-        bool CreateUserAccount(UserAccount data);
+        bool StoreUserAccount(UserAccount data);
     }
 }
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 0270f9d..706da84 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -62,33 +62,85 @@ namespace OpenSim.Services.UserAccountService
             if (d.Length < 1)
                 return null;
 
+            return MakeUserAccount(d[0]);
+        }
+
+        private UserAccount MakeUserAccount(UserAccountData d)
+        {
             UserAccount u = new UserAccount();
-            u.FirstName = d[0].FirstName;
-            u.LastName = d[0].LastName;
-            u.PrincipalID = d[0].PrincipalID;
-            u.ScopeID = d[0].ScopeID;
-            u.Email = d[0].Data["Email"].ToString();
-            u.Created = Convert.ToInt32(d[0].Data["Created"].ToString());
+            u.FirstName = d.FirstName;
+            u.LastName = d.LastName;
+            u.PrincipalID = d.PrincipalID;
+            u.ScopeID = d.ScopeID;
+            u.Email = d.Data["Email"].ToString();
+            u.Created = Convert.ToInt32(d.Data["Created"].ToString());
 
-            return null;
+            string[] URLs = d.Data["ServiceURLs"].ToString().Split(new char[] {' '});
+            u.ServiceURLs = new Dictionary<string, object>();
+
+            foreach(string url in URLs)
+            {
+                string[] parts = url.Split(new char[] {'='});
+
+                if (parts.Length != 2)
+                    continue;
+
+                string name = System.Web.HttpUtility.UrlDecode(parts[0]);
+                string val = System.Web.HttpUtility.UrlDecode(parts[1]);
+
+                u.ServiceURLs[name] = val;
+            }
+
+            return u;
         }
 
         public UserAccount GetUserAccount(UUID scopeID, string email)
         {
-            return null;
+            UserAccountData[] d;
+
+            if (scopeID != UUID.Zero)
+            {
+                d = m_Database.Get(
+                        new string[] {"ScopeID", "Email"},
+                        new string[] {scopeID.ToString(), email});
+            }
+            else
+            {
+                d = m_Database.Get(
+                        new string[] {"Email"},
+                        new string[] {email});
+            }
+
+            if (d.Length < 1)
+                return null;
+
+            return MakeUserAccount(d[0]);
         }
         
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        public UserAccount GetUserAccount(UUID scopeID, UUID principalID)
         {
-            return null;
-        }
+            UserAccountData[] d;
 
-        public bool SetUserAccount(UserAccount data)
-        {
-            return false;
+            if (scopeID != UUID.Zero)
+            {
+                d = m_Database.Get(
+                        new string[] {"ScopeID", "PrincipalID"},
+                        new string[] {scopeID.ToString(), principalID.ToString()});
+            }
+            else
+            {
+                d = m_Database.Get(
+                        new string[] {"PrincipalID"},
+                        new string[] {principalID.ToString()});
+            }
+
+            if (d.Length < 1)
+                return null;
+
+            return MakeUserAccount(d[0]);
         }
 
-        public bool CreateUserAccount(UserAccount data)
+        public bool StoreUserAccount(UserAccount data)
         {
             return false;
         }