2 files changed, 136 insertions, 12 deletions

diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 2157462..fc6a6e1 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -41,27 +41,151 @@ namespace OpenSim.Services.PresenceService
 {
     public class PresenceService : PresenceServiceBase, IPresenceService
     {
-//        private static readonly ILog m_log =
-//                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
 
         public PresenceService(IConfigSource config)
             : base(config)
         {
+            m_log.Debug("[PRESENCE SERVICE]: Starting presence service");
         }
 
-        public bool Report(PresenceInfo presence)
+        public bool LoginAgent(string userID, UUID sessionID,
+                UUID secureSessionID)
         {
-            PresenceData p = new PresenceData();
-            p.Data = new Dictionary<string, string>();
+            m_Database.Prune(userID);
 
-            p.UUID = presence.PrincipalID;
-            p.currentRegion = presence.RegionID;
+            PresenceData[] d = m_Database.Get("UserID", userID);
 
-            foreach (KeyValuePair<string, string> kvp in presence.Data)
-                p.Data[kvp.Key] = kvp.Value;
+            PresenceData data = new PresenceData();
 
-            return false;
+            data.UserID = userID;
+            data.RegionID = UUID.Zero;
+            data.SessionID = sessionID;
+            data.Data["SecureSessionID"] = secureSessionID.ToString();
+            data.Data["Online"] = "true";
+            data.Data["Login"] = Util.UnixTimeSinceEpoch().ToString();
+            if (d.Length > 0)
+            {
+                data.Data["HomeRegionID"] = d[0].Data["HomeRegionID"];
+                data.Data["HomePosition"] = d[0].Data["HomePosition"];
+                data.Data["HomeLookAt"] = d[0].Data["HomeLookAt"];
+            }
+            
+            m_Database.Store(data);
+
+            return true;
+        }
+
+        public bool LogoutAgent(UUID sessionID)
+        {
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return false;
+
+            PresenceData[] d = m_Database.Get("UserID", data.UserID);
+
+            if (d.Length > 1)
+            {
+                m_Database.Delete("SessionID", sessionID.ToString());
+            }
+
+            data.Data["Online"] = "false";
+            data.Data["Logout"] = Util.UnixTimeSinceEpoch().ToString();
+
+            m_Database.Store(data);
+
+            return true;
+        }
+
+        public bool LogoutRegionAgents(UUID regionID)
+        {
+            m_Database.LogoutRegionAgents(regionID);
+
+            return true;
+        }
+
+
+        public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID);
+            PresenceData pdata = m_Database.Get(sessionID);
+            if (pdata == null)
+                return false;
+            if (pdata.Data["Online"] == "false")
+                return false;
+
+            return m_Database.ReportAgent(sessionID, regionID,
+                        position.ToString(), lookAt.ToString());
+        }
+
+        public PresenceInfo GetAgent(UUID sessionID)
+        {
+            PresenceInfo ret = new PresenceInfo();
+            
+            PresenceData data = m_Database.Get(sessionID);
+            if (data == null)
+                return null;
+
+            ret.UserID = data.UserID;
+            ret.RegionID = data.RegionID;
+            if (data.Data.ContainsKey("Online"))
+                ret.Online = bool.Parse(data.Data["Online"]);
+            if (data.Data.ContainsKey("Login"))
+                ret.Login = Util.ToDateTime(Convert.ToInt32(data.Data["Login"]));
+            if (data.Data.ContainsKey("Logout"))
+                ret.Logout = Util.ToDateTime(Convert.ToInt32(data.Data["Logout"]));
+            if (data.Data.ContainsKey("Position"))
+                ret.Position = Vector3.Parse(data.Data["Position"]);
+            if (data.Data.ContainsKey("LookAt"))
+                ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
+            if (data.Data.ContainsKey("HomeRegionID"))
+                ret.HomeRegionID = new UUID(data.Data["HomeRegionID"]);
+            if (data.Data.ContainsKey("HomePosition"))
+                ret.HomePosition = Vector3.Parse(data.Data["HomePosition"]);
+            if (data.Data.ContainsKey("HomeLookAt"))
+                ret.HomeLookAt = Vector3.Parse(data.Data["HomeLookAt"]);
+
+            return ret;
+        }
+
+        public PresenceInfo[] GetAgents(string[] userIDs)
+        {
+            List<PresenceInfo> info = new List<PresenceInfo>();
+
+            foreach (string userIDStr in userIDs)
+            {
+                PresenceData[] data = m_Database.Get("UserID",
+                        userIDStr);
+
+                foreach (PresenceData d in data)
+                {
+                    PresenceInfo ret = new PresenceInfo();
+
+                    ret.UserID = d.UserID;
+                    ret.RegionID = d.RegionID;
+                    ret.Online = bool.Parse(d.Data["Online"]);
+                    ret.Login = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Login"]));
+                    ret.Logout = Util.ToDateTime(Convert.ToInt32(
+                            d.Data["Logout"]));
+                    ret.Position = Vector3.Parse(d.Data["Position"]);
+                    ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
+                    ret.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
+                    ret.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
+                    ret.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
+
+                    info.Add(ret);
+                }
+            }
+
+            return info.ToArray();
+        }
+
+        public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
+        {
+            return m_Database.SetHomeLocation(userID, regionID, position, lookAt);
         }
     }
 }
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
index 60a246b..3ca70c1 100644
--- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs
+++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Services.PresenceService
         {
             string dllName = String.Empty;
             string connString = String.Empty;
-            string realm = "agents";
+            string realm = "presence";
 
             //
             // Try reading the [DatabaseService] section, if it exists