From c2e2997a999ba5bdaa0b598b1286ee73cc14e372 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 19 Jun 2008 21:20:23 +0000
Subject: more work towards nhibernate working with mysql, not there yet, but
 moving in the right direction.

---
 OpenSim/Data/NHibernate/NHibernateAssetData.cs            | 7 +++++--
 OpenSim/Data/NHibernate/NHibernateUserData.cs             | 1 -
 OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml       | 4 ++--
 OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 5c691a7..db77942 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -103,8 +103,9 @@ namespace OpenSim.Data.NHibernate
                 {
                     return session.Load(typeof(AssetBase), uuid) as AssetBase;
                 }
-                catch
+                catch (Exception e)
                 {
+                    m_log.Error("[NHIBERNATE] issue loading asset", e);
                     return null;
                 }
             }
@@ -114,6 +115,7 @@ namespace OpenSim.Data.NHibernate
         {
             if (!ExistsAsset(asset.FullID))
             {
+                m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
                 using (ISession session = factory.OpenSession())
                 {
                     using (ITransaction transaction = session.BeginTransaction())
@@ -155,7 +157,8 @@ namespace OpenSim.Data.NHibernate
 
         override public bool ExistsAsset(LLUUID uuid)
         {
-            return (FetchAsset(uuid) != null) ? true : false;
+            m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
+            return (FetchAsset(uuid) != null);
         }
 
         public void DeleteAsset(LLUUID uuid)
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index a6ab2ac..2bec02c 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -91,7 +91,6 @@ namespace OpenSim.Data.NHibernate
                 {
                     user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
                 }
-                // BUG: CATCHALL IS BAD.
             }
             catch (Exception) {}
 
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index 261c136..60fc146 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -4,8 +4,8 @@
         <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 
             <generator class="assigned" /> 
         </id> 
-        <property name="Type" type="Int16" />
-        <property name="InvType" type="Int16" />
+        <property name="Type" type="System.SByte" />
+        <property name="InvType" type="System.SByte" />
         <property name="Name" type="String" length="64" />
         <property name="Description" type="String" length="64" />
         <property name="Local" type="boolean" />
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index cb83e2c..4003628 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -9,8 +9,8 @@
         <property name="PasswordHash" type="String" length="32" />
         <property name="PasswordSalt" type="String" length="32" />
         <property name="WebLoginKey" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
-        <property name="HomeRegionX" type="Int32" />
-        <property name="HomeRegionY" type="Int32" />
+        <property name="HomeRegionX" type="System.UInt32" />
+        <property name="HomeRegionY" type="System.UInt32" />
         <property name="HomeLocationX" type="Single" />
         <property name="HomeLocationY" type="Single" />
         <property name="HomeLocationZ" type="Single" />
-- 
cgit v1.1