Merged 0.1-prestable back into trunk :(

3 files changed, 97 insertions, 31 deletions

diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index c853b50..caf7eb0 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
@@ -9,20 +9,20 @@ namespace OpenGrid.Framework.Data.DB4o
 {

     class DB4oGridData : IGridData

     {

-        DB4oManager manager;

+        DB4oGridManager manager;

 

         public void Initialise() {

-             manager = new DB4oManager("gridserver.yap");

+             manager = new DB4oGridManager("gridserver.yap");

         }

 

         public SimProfileData GetProfileByHandle(ulong handle) {

-            lock (manager.profiles)

+            lock (manager.simProfiles)

             {

-                foreach (LLUUID UUID in manager.profiles.Keys)

+                foreach (LLUUID UUID in manager.simProfiles.Keys)

                 {

-                    if (manager.profiles[UUID].regionHandle == handle)

+                    if (manager.simProfiles[UUID].regionHandle == handle)

                     {

-                        return manager.profiles[UUID];

+                        return manager.simProfiles[UUID];

                     }

                 }

             }

@@ -31,17 +31,17 @@ namespace OpenGrid.Framework.Data.DB4o
 

         public SimProfileData GetProfileByLLUUID(LLUUID uuid)

         {

-            lock (manager.profiles)

+            lock (manager.simProfiles)

             {

-                if (manager.profiles.ContainsKey(uuid))

-                    return manager.profiles[uuid];

+                if (manager.simProfiles.ContainsKey(uuid))

+                    return manager.simProfiles[uuid];

             }

             throw new Exception("Unable to find profile with UUID (" + uuid.ToStringHyphenated() + ")");

         }

 

         public DataResponse AddProfile(SimProfileData profile)

         {

-            lock (manager.profiles)

+            lock (manager.simProfiles)

             {

                 if (manager.AddRow(profile))

                 {

@@ -55,7 +55,7 @@ namespace OpenGrid.Framework.Data.DB4o
         }

 

         public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) {

-            if (manager.profiles[uuid].regionRecvKey == key)

+            if (manager.simProfiles[uuid].regionRecvKey == key)

                 return true;

             return false;

         }

diff --git a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs b/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
index 3ebcee2..aaa6e91 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oManager.cs
@@ -7,19 +7,19 @@ using libsecondlife;
 

 namespace OpenGrid.Framework.Data.DB4o

 {

-    class DB4oManager

+    class DB4oGridManager

     {

-        public Dictionary<LLUUID, SimProfileData> profiles = new Dictionary<LLUUID, SimProfileData>();

+        public Dictionary<LLUUID, SimProfileData> simProfiles = new Dictionary<LLUUID, SimProfileData>();

         string dbfl;

 

-        public DB4oManager(string db4odb)

+        public DB4oGridManager(string db4odb)

         {

             dbfl = db4odb;

             IObjectContainer database;

             database = Db4oFactory.OpenFile(dbfl);

             IObjectSet result = database.Get(typeof(SimProfileData));

             foreach(SimProfileData row in result) {

-                profiles.Add(row.UUID, row);

+                simProfiles.Add(row.UUID, row);

             }

             database.Close();

         }

@@ -31,7 +31,65 @@ namespace OpenGrid.Framework.Data.DB4o
         /// <returns>Successful?</returns>

         public bool AddRow(SimProfileData row)

         {

-            profiles.Add(row.UUID, row);

+            if (simProfiles.ContainsKey(row.UUID))

+            {

+                simProfiles[row.UUID] = row;

+            }

+            else

+            {

+                simProfiles.Add(row.UUID, row);

+            }

+

+            try

+            {

+                IObjectContainer database;

+                database = Db4oFactory.OpenFile(dbfl);

+                database.Set(row);

+                database.Close();

+                return true;

+            }

+            catch (Exception e)

+            {

+                return false;

+            }

+        }

+

+

+    }

+

+    class DB4oUserManager

+    {

+        public Dictionary<LLUUID, UserProfileData> userProfiles = new Dictionary<LLUUID, UserProfileData>();

+        string dbfl;

+

+        public DB4oUserManager(string db4odb)

+        {

+            dbfl = db4odb;

+            IObjectContainer database;

+            database = Db4oFactory.OpenFile(dbfl);

+            IObjectSet result = database.Get(typeof(UserProfileData));

+            foreach (UserProfileData row in result)

+            {

+                userProfiles.Add(row.UUID, row);

+            }

+            database.Close();

+        }

+

+        /// <summary>

+        /// Adds a new profile to the database (Warning: Probably slow.)

+        /// </summary>

+        /// <param name="row">The profile to add</param>

+        /// <returns>Successful?</returns>

+        public bool AddRow(UserProfileData row)

+        {

+            if (userProfiles.ContainsKey(row.UUID))

+            {

+                userProfiles[row.UUID] = row;

+            }

+            else

+            {

+                userProfiles.Add(row.UUID, row);

+            }

 

             try

             {

diff --git a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
index 45a2d44..6ef93c2 100644
--- a/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
+++ b/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{39BD9497-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenGrid.Framework.Data.DB4o</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenGrid.Framework.Data.DB4o</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,27 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data" >

+    <Reference Include="System.Data">

       <HintPath>System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,7 +91,7 @@
       <Name>OpenGrid.Framework.Data</Name>

       <Project>{62CDF671-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -94,6 +101,7 @@
     <Compile Include="DB4oManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="DB4oUserData.cs" />

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -105,4 +113,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file