aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2010-01-04 18:47:47 +0000
committerMelanie2010-01-04 18:47:47 +0000
commit53d3f46add698dd862c018e614778c1c19b0eda4 (patch)
tree44b188689613ac0d041ae720305ea0c8fe6c953a /OpenSim/Data
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-53d3f46add698dd862c018e614778c1c19b0eda4.zip
opensim-SC-53d3f46add698dd862c018e614778c1c19b0eda4.tar.gz
opensim-SC-53d3f46add698dd862c018e614778c1c19b0eda4.tar.bz2
opensim-SC-53d3f46add698dd862c018e614778c1c19b0eda4.tar.xz
First stage port of the XInventoryService
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/IXInventoryData.cs82
-rw-r--r--OpenSim/Data/MySQL/MySQLGenericTableHandler.cs5
-rw-r--r--OpenSim/Data/MySQL/MySQLXInventoryData.cs113
3 files changed, 200 insertions, 0 deletions
diff --git a/OpenSim/Data/IXInventoryData.cs b/OpenSim/Data/IXInventoryData.cs
new file mode 100644
index 0000000..88174d9
--- /dev/null
+++ b/OpenSim/Data/IXInventoryData.cs
@@ -0,0 +1,82 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using OpenMetaverse;
31using OpenSim.Framework;
32
33namespace OpenSim.Data
34{
35 public class XInventoryFolder
36 {
37 public string folderName;
38 public int type;
39 public int version;
40 public UUID folderID;
41 public UUID agentID;
42 public UUID parentFolderID;
43 }
44
45 public class XInventoryItem
46 {
47 public UUID assetID;
48 public int assetType;
49 public string inventoryName;
50 public string inventoryDescription;
51 public int inventoryNextPermissions;
52 public int inventoryCurrentPermissions;
53 public int invType;
54 public UUID creatorID;
55 public int inventoryBasePermissions;
56 public int inventoryEveryOnePermissions;
57 public int salePrice;
58 public int saleType;
59 public int creationDate;
60 public UUID groupID;
61 public bool groupOwned;
62 public int flags;
63 public UUID inventoryID;
64 public UUID avatarID;
65 public UUID parentFolderID;
66 public int inventoryGroupPermissions;
67 }
68
69 public interface IXInventoryData
70 {
71 XInventoryFolder[] GetFolders(string[] fields, string[] vals);
72 XInventoryItem[] GetItems(string[] fields, string[] vals);
73
74 bool StoreFolder(XInventoryFolder folder);
75 bool StoreItem(XInventoryItem item);
76
77 bool DeleteFolders(string field, string val);
78 bool DeleteItems(string field, string val);
79
80 bool MoveItem(string principalID, string id, string newParent);
81 }
82}
diff --git a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
index b2bd5f6..fdb98eb 100644
--- a/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
+++ b/OpenSim/Data/MySQL/MySQLGenericTableHandler.cs
@@ -153,6 +153,11 @@ namespace OpenSim.Data.MySQL
153 UUID.TryParse(reader[name].ToString(), out uuid); 153 UUID.TryParse(reader[name].ToString(), out uuid);
154 m_Fields[name].SetValue(row, uuid); 154 m_Fields[name].SetValue(row, uuid);
155 } 155 }
156 else if (m_Fields[name].GetValue(row) is int)
157 {
158 int v = Convert.ToInt32(reader[name]);
159 m_Fields[name].SetValue(row, v);
160 }
156 else 161 else
157 { 162 {
158 m_Fields[name].SetValue(row, reader[name]); 163 m_Fields[name].SetValue(row, reader[name]);
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
new file mode 100644
index 0000000..dd3e6ea
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -0,0 +1,113 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Data;
30using System.Reflection;
31using System.Collections.Generic;
32using log4net;
33using MySql.Data.MySqlClient;
34using OpenMetaverse;
35using OpenSim.Framework;
36
37namespace OpenSim.Data.MySQL
38{
39 /// <summary>
40 /// A MySQL Interface for the Asset Server
41 /// </summary>
42 public class MySQLXInventoryData : IXInventoryData
43 {
44 private static readonly ILog m_log = LogManager.GetLogger(
45 MethodBase.GetCurrentMethod().DeclaringType);
46
47 private MySQLGenericTableHandler<XInventoryFolder> m_Folders;
48 private MySqlItemHandler m_Items;
49
50 public MySQLXInventoryData(string conn, string realm)
51 {
52 m_Folders = new MySQLGenericTableHandler<XInventoryFolder>(
53 conn, "inventoryfolders", "InventoryStore");
54 m_Items = new MySqlItemHandler(
55 conn, "inventoryitems", String.Empty);
56 }
57
58 public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
59 {
60 return m_Folders.Get(fields, vals);
61 }
62
63 public XInventoryItem[] GetItems(string[] fields, string[] vals)
64 {
65 return m_Items.Get(fields, vals);
66 }
67
68 public bool StoreFolder(XInventoryFolder folder)
69 {
70 return m_Folders.Store(folder);
71 }
72
73 public bool StoreItem(XInventoryItem item)
74 {
75 return m_Items.Store(item);
76 }
77
78 public bool DeleteFolders(string field, string val)
79 {
80 return m_Folders.Delete(field, val);
81 }
82
83 public bool DeleteItems(string field, string val)
84 {
85 return m_Items.Delete(field, val);
86 }
87
88 public bool MoveItem(string principalID, string id, string newParent)
89 {
90 return m_Items.MoveItem(principalID, id, newParent);
91 }
92 }
93
94 public class MySqlItemHandler : MySQLGenericTableHandler<XInventoryItem>
95 {
96 public MySqlItemHandler(string c, string t, string m) :
97 base(c, t, m)
98 {
99 }
100
101 public bool MoveItem(string principalID, string id, string newParent)
102 {
103 MySqlCommand cmd = new MySqlCommand();
104
105 cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where agentID = ?AgentID and folderID = ?FolderID");
106 cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
107 cmd.Parameters.AddWithValue("?FolderID", id);
108 cmd.Parameters.AddWithValue("?AgentID", principalID);
109
110 return ExecuteNonQuery(cmd) == 0 ? false : true;
111 }
112 }
113}