From ce5e51240f6bfb6e0bd524c4cb13d577c92f789c Mon Sep 17 00:00:00 2001
From: Sean Dague <sean@dague.net>
Date: Wed, 9 Apr 2008 18:04:03 +0000
Subject: [PATCH] NHibernate Inventory support.  Lightly tested, but seems to
 work well enough on my test environment.  Will need to add some exception
 catching down the road.

On to User Store.
---
 .../NHibernate/NHibernateInventoryData.cs     | 22 +++++++++----------
 .../Resources/InventoryFolderBase.hbm.xml     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index f99273a05f..a004e29fae 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -298,7 +298,7 @@ namespace OpenSim.Data.NHibernate
         public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID)
         {
             using(ISession session = factory.OpenSession()) {
-                try {
+                // try {
                     ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase));
                     criteria.Add(Expression.Eq("Folder", folderID) );
                     List<InventoryItemBase> list = new List<InventoryItemBase>();
@@ -307,9 +307,9 @@ namespace OpenSim.Data.NHibernate
                         list.Add(item);
                     }
                     return list;
-                } catch {
-                    return new List<InventoryItemBase>();
-                }
+//                 } catch {
+//                     return new List<InventoryItemBase>();
+//                 }
             }
         }
 
@@ -322,7 +322,7 @@ namespace OpenSim.Data.NHibernate
         public InventoryFolderBase getUserRootFolder(LLUUID user)
         {
             using(ISession session = factory.OpenSession()) {
-                try {
+                //                try {
                     ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
                     criteria.Add(Expression.Eq("ParentID", LLUUID.Zero) );
                     criteria.Add(Expression.Eq("Owner", user) );
@@ -332,9 +332,9 @@ namespace OpenSim.Data.NHibernate
                     }
                     m_log.ErrorFormat("No Inventory Root Folder Found for: {0}", user);
                     return new InventoryFolderBase();
-                } catch {
-                    return new InventoryFolderBase();
-                }
+//                 } catch {
+//                     return new InventoryFolderBase();
+//                 }
             }
         }
         
@@ -347,9 +347,9 @@ namespace OpenSim.Data.NHibernate
         {
             using(ISession session = factory.OpenSession()) {
                 // try {
-                    IQuery query = session.CreateQuery("from InventoryFolders i where i.ParentID = :parent");
-                    query.SetParameter("parent", parentID, NHibernateUtil.Custom(typeof(LLUUIDUserType)));
-                    foreach (InventoryFolderBase item in query.List())
+                    ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
+                    criteria.Add(Expression.Eq("ParentID", parentID) );
+                    foreach (InventoryFolderBase item in criteria.List())
                     {
                         folders.Add(item);
                     }
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index 71a66022bb..4411071657 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -5,7 +5,7 @@
             <generator class="assigned" /> 
         </id> 
         <property name="Type" type="short" />
-        <property name="Version" type="short" />
+        <property name="Version" type="UInt16" />
         <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" />
         <property name="Name" type="String" length="64" />