diff options
author | Diva Canto | 2009-08-10 20:31:51 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-10 20:31:51 -0700 |
commit | cdcbc48534f19afe7cbdeb6c690e6b7d9f2ff099 (patch) | |
tree | 4d42dff30b4ca8d9f770209c257484c1a2295ddf /OpenSim/Services/Connectors | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-cdcbc48534f19afe7cbdeb6c690e6b7d9f2ff099.zip opensim-SC_OLD-cdcbc48534f19afe7cbdeb6c690e6b7d9f2ff099.tar.gz opensim-SC_OLD-cdcbc48534f19afe7cbdeb6c690e6b7d9f2ff099.tar.bz2 opensim-SC_OLD-cdcbc48534f19afe7cbdeb6c690e6b7d9f2ff099.tar.xz |
Added two new methods to IIventoryService -- GetFolderForType and GetFolderContent. Some meat to it, but not completed. None of this code is called anywhere yet.
Diffstat (limited to '')
4 files changed, 113 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs index 01e517c..b168871 100644 --- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs | |||
@@ -120,6 +120,48 @@ namespace OpenSim.Services.Connectors.Inventory | |||
120 | 120 | ||
121 | } | 121 | } |
122 | 122 | ||
123 | /// <summary> | ||
124 | /// Gets the user folder for the given folder-type | ||
125 | /// </summary> | ||
126 | /// <param name="userID"></param> | ||
127 | /// <param name="type"></param> | ||
128 | /// <returns></returns> | ||
129 | public List<InventoryFolderBase> GetSystemFolders(string id, UUID sessionID) | ||
130 | { | ||
131 | m_log.Debug("[HGInventory]: GetSystemFolders " + id); | ||
132 | string url = string.Empty; | ||
133 | string userID = string.Empty; | ||
134 | |||
135 | if (StringToUrlAndUserID(id, out url, out userID)) | ||
136 | { | ||
137 | ISessionAuthInventoryService connector = GetConnector(url); | ||
138 | return connector.GetSystemFolders(userID, sessionID); | ||
139 | } | ||
140 | |||
141 | return new List<InventoryFolderBase>(); | ||
142 | } | ||
143 | |||
144 | /// <summary> | ||
145 | /// Gets everything (folders and items) inside a folder | ||
146 | /// </summary> | ||
147 | /// <param name="userId"></param> | ||
148 | /// <param name="folderID"></param> | ||
149 | /// <returns></returns> | ||
150 | public InventoryCollection GetFolderContent(string id, UUID folderID, UUID sessionID) | ||
151 | { | ||
152 | m_log.Debug("[HGInventory]: GetSystemFolders " + id); | ||
153 | string url = string.Empty; | ||
154 | string userID = string.Empty; | ||
155 | |||
156 | if (StringToUrlAndUserID(id, out url, out userID)) | ||
157 | { | ||
158 | ISessionAuthInventoryService connector = GetConnector(url); | ||
159 | return connector.GetFolderContent(userID, folderID, sessionID); | ||
160 | } | ||
161 | |||
162 | return null; | ||
163 | } | ||
164 | |||
123 | public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID) | 165 | public bool AddFolder(string id, InventoryFolderBase folder, UUID sessionID) |
124 | { | 166 | { |
125 | string url = string.Empty; | 167 | string url = string.Empty; |
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs index 4fc4363..98fd680 100644 --- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs +++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
28 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
29 | using OpenSim.Services.Interfaces; | 30 | using OpenSim.Services.Interfaces; |
30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
@@ -51,6 +52,22 @@ namespace OpenSim.Services.Connectors | |||
51 | void GetUserInventory(string userID, UUID session_id, InventoryReceiptCallback callback); | 52 | void GetUserInventory(string userID, UUID session_id, InventoryReceiptCallback callback); |
52 | 53 | ||
53 | /// <summary> | 54 | /// <summary> |
55 | /// Gets the user folder for the given folder-type | ||
56 | /// </summary> | ||
57 | /// <param name="userID"></param> | ||
58 | /// <param name="type"></param> | ||
59 | /// <returns></returns> | ||
60 | List<InventoryFolderBase> GetSystemFolders(string userID, UUID session_id); | ||
61 | |||
62 | /// <summary> | ||
63 | /// Gets everything (folders and items) inside a folder | ||
64 | /// </summary> | ||
65 | /// <param name="userId"></param> | ||
66 | /// <param name="folderID"></param> | ||
67 | /// <returns></returns> | ||
68 | InventoryCollection GetFolderContent(string userID, UUID folderID, UUID session_id); | ||
69 | |||
70 | /// <summary> | ||
54 | /// Add a new folder to the user's inventory | 71 | /// Add a new folder to the user's inventory |
55 | /// </summary> | 72 | /// </summary> |
56 | /// <param name="folder"></param> | 73 | /// <param name="folder"></param> |
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index ae15cfb..1a6826e 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | |||
@@ -155,6 +155,50 @@ namespace OpenSim.Services.Connectors | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | /// <summary> | ||
159 | /// Gets the user folder for the given folder-type | ||
160 | /// </summary> | ||
161 | /// <param name="userID"></param> | ||
162 | /// <param name="type"></param> | ||
163 | /// <returns></returns> | ||
164 | public List<InventoryFolderBase> GetSystemFolders(string userID, UUID sessionID) | ||
165 | { | ||
166 | try | ||
167 | { | ||
168 | return SynchronousRestSessionObjectPoster<string, List<InventoryFolderBase>>.BeginPostObject( | ||
169 | "GET", m_ServerURI + "/SystemFolders/", userID, sessionID.ToString(), userID.ToString()); | ||
170 | } | ||
171 | catch (Exception e) | ||
172 | { | ||
173 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}", | ||
174 | e.Source, e.Message); | ||
175 | } | ||
176 | |||
177 | return new List<InventoryFolderBase>(); | ||
178 | } | ||
179 | |||
180 | /// <summary> | ||
181 | /// Gets everything (folders and items) inside a folder | ||
182 | /// </summary> | ||
183 | /// <param name="userId"></param> | ||
184 | /// <param name="folderID"></param> | ||
185 | /// <returns></returns> | ||
186 | public InventoryCollection GetFolderContent(string userID, UUID folderID, UUID sessionID) | ||
187 | { | ||
188 | try | ||
189 | { | ||
190 | return SynchronousRestSessionObjectPoster<UUID, InventoryCollection>.BeginPostObject( | ||
191 | "GET", m_ServerURI + "/GetFolderContents/", folderID, sessionID.ToString(), userID.ToString()); | ||
192 | } | ||
193 | catch (Exception e) | ||
194 | { | ||
195 | m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderForType operation failed, {0} {1}", | ||
196 | e.Source, e.Message); | ||
197 | } | ||
198 | |||
199 | return null; | ||
200 | } | ||
201 | |||
158 | public bool AddFolder(string userID, InventoryFolderBase folder, UUID sessionID) | 202 | public bool AddFolder(string userID, InventoryFolderBase folder, UUID sessionID) |
159 | { | 203 | { |
160 | try | 204 | try |
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index a804973..22289aa 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -106,6 +106,16 @@ namespace OpenSim.Services.Connectors | |||
106 | { | 106 | { |
107 | } | 107 | } |
108 | 108 | ||
109 | public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) | ||
110 | { | ||
111 | return null; | ||
112 | } | ||
113 | |||
114 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | ||
115 | { | ||
116 | return null; | ||
117 | } | ||
118 | |||
109 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) | 119 | public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) |
110 | { | 120 | { |
111 | return null; | 121 | return null; |