Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 1434:f9cd40166269
refactoring of OrthancPlugins, improvement in ServeFolders
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 30 Jun 2015 16:04:05 +0200 |
parents | 461e7554bff7 |
children | 02f5a3f5c0a0 |
comparison
equal
deleted
inserted
replaced
1433:461e7554bff7 | 1434:f9cd40166269 |
---|---|
130 v.append("explorer.js"); | 130 v.append("explorer.js"); |
131 | 131 |
132 if (OrthancRestApi::GetContext(call).HasPlugins()) | 132 if (OrthancRestApi::GetContext(call).HasPlugins()) |
133 { | 133 { |
134 std::list<std::string> plugins; | 134 std::list<std::string> plugins; |
135 OrthancRestApi::GetContext(call).GetPluginsManager().ListPlugins(plugins); | 135 OrthancRestApi::GetContext(call).GetPlugins().GetManager().ListPlugins(plugins); |
136 | 136 |
137 for (std::list<std::string>::const_iterator | 137 for (std::list<std::string>::const_iterator |
138 it = plugins.begin(); it != plugins.end(); ++it) | 138 it = plugins.begin(); it != plugins.end(); ++it) |
139 { | 139 { |
140 v.append(*it); | 140 v.append(*it); |
150 if (!OrthancRestApi::GetContext(call).HasPlugins()) | 150 if (!OrthancRestApi::GetContext(call).HasPlugins()) |
151 { | 151 { |
152 return; | 152 return; |
153 } | 153 } |
154 | 154 |
155 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPluginsManager(); | 155 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPlugins().GetManager(); |
156 std::string id = call.GetUriComponent("id", ""); | 156 std::string id = call.GetUriComponent("id", ""); |
157 | 157 |
158 if (manager.HasPlugin(id)) | 158 if (manager.HasPlugin(id)) |
159 { | 159 { |
160 Json::Value v = Json::objectValue; | 160 Json::Value v = Json::objectValue; |
161 v["ID"] = id; | 161 v["ID"] = id; |
162 v["Version"] = manager.GetPluginVersion(id); | 162 v["Version"] = manager.GetPluginVersion(id); |
163 | 163 |
164 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetOrthancPlugins(); | 164 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins(); |
165 const char *c = plugins.GetProperty(id.c_str(), _OrthancPluginProperty_RootUri); | 165 const char *c = plugins.GetProperty(id.c_str(), _OrthancPluginProperty_RootUri); |
166 if (c != NULL) | 166 if (c != NULL) |
167 { | 167 { |
168 v["RootUri"] = c; | 168 v["RootUri"] = c; |
169 } | 169 } |
186 { | 186 { |
187 std::string s = "// Extensions to Orthanc Explorer by the registered plugins\n\n"; | 187 std::string s = "// Extensions to Orthanc Explorer by the registered plugins\n\n"; |
188 | 188 |
189 if (OrthancRestApi::GetContext(call).HasPlugins()) | 189 if (OrthancRestApi::GetContext(call).HasPlugins()) |
190 { | 190 { |
191 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPluginsManager(); | 191 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins(); |
192 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetOrthancPlugins(); | 192 const PluginsManager& manager = plugins.GetManager(); |
193 | 193 |
194 std::list<std::string> lst; | 194 std::list<std::string> lst; |
195 OrthancRestApi::GetContext(call).GetPluginsManager().ListPlugins(lst); | 195 manager.ListPlugins(lst); |
196 | 196 |
197 for (std::list<std::string>::const_iterator | 197 for (std::list<std::string>::const_iterator |
198 it = lst.begin(); it != lst.end(); ++it) | 198 it = lst.begin(); it != lst.end(); ++it) |
199 { | 199 { |
200 const char* tmp = plugins.GetProperty(it->c_str(), _OrthancPluginProperty_OrthancExplorer); | 200 const char* tmp = plugins.GetProperty(it->c_str(), _OrthancPluginProperty_OrthancExplorer); |