Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 2136:dd609a99d39a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniformization of the macro naming
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 09 Nov 2016 14:08:05 +0100
parents fabf7820d1f1
children aa4b8895cd23
comparison
equal deleted inserted replaced
2135:cadfe0a2a393 2136:dd609a99d39a
61 result["Version"] = ORTHANC_VERSION; 61 result["Version"] = ORTHANC_VERSION;
62 62
63 result["StorageAreaPlugin"] = Json::nullValue; 63 result["StorageAreaPlugin"] = Json::nullValue;
64 result["DatabaseBackendPlugin"] = Json::nullValue; 64 result["DatabaseBackendPlugin"] = Json::nullValue;
65 65
66 #if ORTHANC_PLUGINS_ENABLED == 1 66 #if ORTHANC_ENABLE_PLUGINS == 1
67 result["PluginsEnabled"] = true; 67 result["PluginsEnabled"] = true;
68 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins(); 68 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
69 69
70 if (plugins.HasStorageArea()) 70 if (plugins.HasStorageArea())
71 { 71 {
151 151
152 v.append("explorer.js"); 152 v.append("explorer.js");
153 153
154 if (OrthancRestApi::GetContext(call).HasPlugins()) 154 if (OrthancRestApi::GetContext(call).HasPlugins())
155 { 155 {
156 #if ORTHANC_PLUGINS_ENABLED == 1 156 #if ORTHANC_ENABLE_PLUGINS == 1
157 std::list<std::string> plugins; 157 std::list<std::string> plugins;
158 OrthancRestApi::GetContext(call).GetPlugins().GetManager().ListPlugins(plugins); 158 OrthancRestApi::GetContext(call).GetPlugins().GetManager().ListPlugins(plugins);
159 159
160 for (std::list<std::string>::const_iterator 160 for (std::list<std::string>::const_iterator
161 it = plugins.begin(); it != plugins.end(); ++it) 161 it = plugins.begin(); it != plugins.end(); ++it)
174 if (!OrthancRestApi::GetContext(call).HasPlugins()) 174 if (!OrthancRestApi::GetContext(call).HasPlugins())
175 { 175 {
176 return; 176 return;
177 } 177 }
178 178
179 #if ORTHANC_PLUGINS_ENABLED == 1 179 #if ORTHANC_ENABLE_PLUGINS == 1
180 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPlugins().GetManager(); 180 const PluginsManager& manager = OrthancRestApi::GetContext(call).GetPlugins().GetManager();
181 std::string id = call.GetUriComponent("id", ""); 181 std::string id = call.GetUriComponent("id", "");
182 182
183 if (manager.HasPlugin(id)) 183 if (manager.HasPlugin(id))
184 { 184 {
222 { 222 {
223 std::string s = "// Extensions to Orthanc Explorer by the registered plugins\n\n"; 223 std::string s = "// Extensions to Orthanc Explorer by the registered plugins\n\n";
224 224
225 if (OrthancRestApi::GetContext(call).HasPlugins()) 225 if (OrthancRestApi::GetContext(call).HasPlugins())
226 { 226 {
227 #if ORTHANC_PLUGINS_ENABLED == 1 227 #if ORTHANC_ENABLE_PLUGINS == 1
228 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins(); 228 const OrthancPlugins& plugins = OrthancRestApi::GetContext(call).GetPlugins();
229 const PluginsManager& manager = plugins.GetManager(); 229 const PluginsManager& manager = plugins.GetManager();
230 230
231 std::list<std::string> lst; 231 std::list<std::string> lst;
232 manager.ListPlugins(lst); 232 manager.ListPlugins(lst);