diff options
Diffstat (limited to 'OpenSim/Data/NHibernate/NHibernateInventoryData.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs index fa75588..228e0b6 100644 --- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs +++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs | |||
@@ -62,23 +62,23 @@ namespace OpenSim.Data.NHibernate | |||
62 | // TODO: make this a real exception type | 62 | // TODO: make this a real exception type |
63 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); | 63 | throw new Exception("Malformed Inventory connection string '" + connect + "'"); |
64 | } | 64 | } |
65 | 65 | ||
66 | // Establish NHibernate Connection | 66 | // Establish NHibernate Connection |
67 | cfg = new Configuration(); | 67 | cfg = new Configuration(); |
68 | cfg.SetProperty(Environment.ConnectionProvider, | 68 | cfg.SetProperty(Environment.ConnectionProvider, |
69 | "NHibernate.Connection.DriverConnectionProvider"); | 69 | "NHibernate.Connection.DriverConnectionProvider"); |
70 | cfg.SetProperty(Environment.Dialect, | 70 | cfg.SetProperty(Environment.Dialect, |
71 | "NHibernate.Dialect." + parts[0]); | 71 | "NHibernate.Dialect." + parts[0]); |
72 | cfg.SetProperty(Environment.ConnectionDriver, | 72 | cfg.SetProperty(Environment.ConnectionDriver, |
73 | "NHibernate.Driver." + parts[1]); | 73 | "NHibernate.Driver." + parts[1]); |
74 | cfg.SetProperty(Environment.ConnectionString, parts[2]); | 74 | cfg.SetProperty(Environment.ConnectionString, parts[2]); |
75 | cfg.AddAssembly("OpenSim.Data.NHibernate"); | 75 | cfg.AddAssembly("OpenSim.Data.NHibernate"); |
76 | 76 | ||
77 | HbmSerializer.Default.Validate = true; | 77 | HbmSerializer.Default.Validate = true; |
78 | using ( MemoryStream stream = | 78 | using ( MemoryStream stream = |
79 | HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) | 79 | HbmSerializer.Default.Serialize(Assembly.GetExecutingAssembly())) |
80 | cfg.AddInputStream(stream); | 80 | cfg.AddInputStream(stream); |
81 | 81 | ||
82 | // If uncommented this will auto create tables, but it | 82 | // If uncommented this will auto create tables, but it |
83 | // does drops of the old tables, so we need a smarter way | 83 | // does drops of the old tables, so we need a smarter way |
84 | // to acturally manage this. | 84 | // to acturally manage this. |
@@ -120,8 +120,8 @@ namespace OpenSim.Data.NHibernate | |||
120 | 120 | ||
121 | /***************************************************************** | 121 | /***************************************************************** |
122 | * | 122 | * |
123 | * Basic CRUD operations on Data | 123 | * Basic CRUD operations on Data |
124 | * | 124 | * |
125 | ****************************************************************/ | 125 | ****************************************************************/ |
126 | 126 | ||
127 | // READ | 127 | // READ |
@@ -195,7 +195,7 @@ namespace OpenSim.Data.NHibernate | |||
195 | } | 195 | } |
196 | 196 | ||
197 | /// <summary> | 197 | /// <summary> |
198 | /// | 198 | /// |
199 | /// </summary> | 199 | /// </summary> |
200 | /// <param name="item"></param> | 200 | /// <param name="item"></param> |
201 | public void deleteInventoryItem(LLUUID itemID) | 201 | public void deleteInventoryItem(LLUUID itemID) |
@@ -279,7 +279,7 @@ namespace OpenSim.Data.NHibernate | |||
279 | } | 279 | } |
280 | 280 | ||
281 | /// <summary> | 281 | /// <summary> |
282 | /// | 282 | /// |
283 | /// </summary> | 283 | /// </summary> |
284 | /// <param name="folder"></param> | 284 | /// <param name="folder"></param> |
285 | public void deleteInventoryFolder(LLUUID folderID) | 285 | public void deleteInventoryFolder(LLUUID folderID) |
@@ -353,7 +353,7 @@ namespace OpenSim.Data.NHibernate | |||
353 | { | 353 | { |
354 | updateInventoryItem(item); | 354 | updateInventoryItem(item); |
355 | } | 355 | } |
356 | 356 | ||
357 | 357 | ||
358 | 358 | ||
359 | /// <summary> | 359 | /// <summary> |
@@ -403,9 +403,9 @@ namespace OpenSim.Data.NHibernate | |||
403 | return null; | 403 | return null; |
404 | } | 404 | } |
405 | } | 405 | } |
406 | 406 | ||
407 | /// <summary> | 407 | /// <summary> |
408 | /// Append a list of all the child folders of a parent folder | 408 | /// Append a list of all the child folders of a parent folder |
409 | /// </summary> | 409 | /// </summary> |
410 | /// <param name="folders">list where folders will be appended</param> | 410 | /// <param name="folders">list where folders will be appended</param> |
411 | /// <param name="parentID">ID of parent</param> | 411 | /// <param name="parentID">ID of parent</param> |
@@ -413,7 +413,7 @@ namespace OpenSim.Data.NHibernate | |||
413 | { | 413 | { |
414 | using (ISession session = factory.OpenSession()) | 414 | using (ISession session = factory.OpenSession()) |
415 | { | 415 | { |
416 | 416 | ||
417 | ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); | 417 | ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); |
418 | criteria.Add(Expression.Eq("ParentID", parentID)); | 418 | criteria.Add(Expression.Eq("ParentID", parentID)); |
419 | foreach (InventoryFolderBase item in criteria.List()) | 419 | foreach (InventoryFolderBase item in criteria.List()) |
@@ -443,7 +443,7 @@ namespace OpenSim.Data.NHibernate | |||
443 | 443 | ||
444 | for (int i = 0; i < folders.Count; i++) | 444 | for (int i = 0; i < folders.Count; i++) |
445 | getInventoryFolders(ref folders, folders[i].ID); | 445 | getInventoryFolders(ref folders, folders[i].ID); |
446 | 446 | ||
447 | return folders; | 447 | return folders; |
448 | } | 448 | } |
449 | } | 449 | } |