Mercurial > hg > orthanc
comparison OrthancServer/main.cpp @ 3048:8b331be57606
fix build without plugins
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 Dec 2018 16:18:20 +0100 |
parents | bbfd95a0c429 |
children | 6a2c7e206ebb 4e43e67f8ecf |
comparison
equal
deleted
inserted
replaced
3045:095193bbd7b9 | 3048:8b331be57606 |
---|---|
354 const char* ip, | 354 const char* ip, |
355 const char* username, | 355 const char* username, |
356 const IHttpHandler::Arguments& httpHeaders, | 356 const IHttpHandler::Arguments& httpHeaders, |
357 const IHttpHandler::GetArguments& getArguments) | 357 const IHttpHandler::GetArguments& getArguments) |
358 { | 358 { |
359 #if ORTHANC_ENABLE_PLUGINS == 1 | |
359 if (plugins_ != NULL && | 360 if (plugins_ != NULL && |
360 !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments)) | 361 !plugins_->IsAllowed(method, uri, ip, username, httpHeaders, getArguments)) |
361 { | 362 { |
362 return false; | 363 return false; |
363 } | 364 } |
365 #endif | |
364 | 366 |
365 static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; | 367 static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; |
366 | 368 |
367 LuaScripting::Lock lock(context_.GetLuaScripting()); | 369 LuaScripting::Lock lock(context_.GetLuaScripting()); |
368 | 370 |
1230 return ConfigureDatabase(*database, *storage, &plugins, | 1232 return ConfigureDatabase(*database, *storage, &plugins, |
1231 upgradeDatabase, loadJobsFromDatabase); | 1233 upgradeDatabase, loadJobsFromDatabase); |
1232 | 1234 |
1233 #elif ORTHANC_ENABLE_PLUGINS == 0 | 1235 #elif ORTHANC_ENABLE_PLUGINS == 0 |
1234 // The plugins are disabled | 1236 // The plugins are disabled |
1235 databasePtr.reset(lock.GetConfiguration().CreateDatabaseWrapper()); | 1237 |
1236 storage.reset(lock.GetConfiguration().CreateStorageArea()); | 1238 databasePtr.reset(CreateDatabaseWrapper()); |
1239 storage.reset(CreateStorageArea()); | |
1240 | |
1241 assert(databasePtr.get() != NULL); | |
1242 assert(storage.get() != NULL); | |
1237 | 1243 |
1238 return ConfigureDatabase(*databasePtr, *storage, NULL, | 1244 return ConfigureDatabase(*databasePtr, *storage, NULL, |
1239 upgradeDatabase, loadJobsFromDatabase); | 1245 upgradeDatabase, loadJobsFromDatabase); |
1240 | 1246 |
1241 #else | 1247 #else |