Mercurial > hg > orthanc
comparison OrthancServer/main.cpp @ 2136:dd609a99d39a
uniformization of the macro naming
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 09 Nov 2016 14:08:05 +0100 |
parents | 15ae532af70e |
children | aa4b8895cd23 |
comparison
equal
deleted
inserted
replaced
2135:cadfe0a2a393 | 2136:dd609a99d39a |
---|---|
368 const char* uri) | 368 const char* uri) |
369 { | 369 { |
370 { | 370 { |
371 bool isPlugin = false; | 371 bool isPlugin = false; |
372 | 372 |
373 #if ORTHANC_PLUGINS_ENABLED == 1 | 373 #if ORTHANC_ENABLE_PLUGINS == 1 |
374 if (plugins_ != NULL) | 374 if (plugins_ != NULL) |
375 { | 375 { |
376 plugins_->GetErrorDictionary().LogError(exception.GetErrorCode(), true); | 376 plugins_->GetErrorDictionary().LogError(exception.GetErrorCode(), true); |
377 isPlugin = true; | 377 isPlugin = true; |
378 } | 378 } |
389 HttpStatus httpStatus = exception.GetHttpStatus(); | 389 HttpStatus httpStatus = exception.GetHttpStatus(); |
390 | 390 |
391 { | 391 { |
392 bool isPlugin = false; | 392 bool isPlugin = false; |
393 | 393 |
394 #if ORTHANC_PLUGINS_ENABLED == 1 | 394 #if ORTHANC_ENABLE_PLUGINS == 1 |
395 if (plugins_ != NULL && | 395 if (plugins_ != NULL && |
396 plugins_->GetErrorDictionary().Format(message, httpStatus, exception)) | 396 plugins_->GetErrorDictionary().Format(message, httpStatus, exception)) |
397 { | 397 { |
398 errorCode = ErrorCode_Plugin; | 398 errorCode = ErrorCode_Plugin; |
399 isPlugin = true; | 399 isPlugin = true; |
619 } | 619 } |
620 } | 620 } |
621 | 621 |
622 | 622 |
623 | 623 |
624 #if ORTHANC_PLUGINS_ENABLED == 1 | 624 #if ORTHANC_ENABLE_PLUGINS == 1 |
625 static void LoadPlugins(OrthancPlugins& plugins) | 625 static void LoadPlugins(OrthancPlugins& plugins) |
626 { | 626 { |
627 std::list<std::string> path; | 627 std::list<std::string> path; |
628 Configuration::GetGlobalListOfStringsParameter(path, "Plugins"); | 628 Configuration::GetGlobalListOfStringsParameter(path, "Plugins"); |
629 for (std::list<std::string>::const_iterator | 629 for (std::list<std::string>::const_iterator |
642 static bool WaitForExit(ServerContext& context, | 642 static bool WaitForExit(ServerContext& context, |
643 OrthancRestApi& restApi) | 643 OrthancRestApi& restApi) |
644 { | 644 { |
645 LOG(WARNING) << "Orthanc has started"; | 645 LOG(WARNING) << "Orthanc has started"; |
646 | 646 |
647 #if ORTHANC_PLUGINS_ENABLED == 1 | 647 #if ORTHANC_ENABLE_PLUGINS == 1 |
648 if (context.HasPlugins()) | 648 if (context.HasPlugins()) |
649 { | 649 { |
650 context.GetPlugins().SignalOrthancStarted(); | 650 context.GetPlugins().SignalOrthancStarted(); |
651 } | 651 } |
652 #endif | 652 #endif |
685 } | 685 } |
686 } | 686 } |
687 | 687 |
688 context.GetLua().Execute("Finalize"); | 688 context.GetLua().Execute("Finalize"); |
689 | 689 |
690 #if ORTHANC_PLUGINS_ENABLED == 1 | 690 #if ORTHANC_ENABLE_PLUGINS == 1 |
691 if (context.HasPlugins()) | 691 if (context.HasPlugins()) |
692 { | 692 { |
693 context.GetPlugins().SignalOrthancStopped(); | 693 context.GetPlugins().SignalOrthancStopped(); |
694 } | 694 } |
695 #endif | 695 #endif |
786 dicomServer.SetMoveRequestHandlerFactory(serverFactory); | 786 dicomServer.SetMoveRequestHandlerFactory(serverFactory); |
787 dicomServer.SetFindRequestHandlerFactory(serverFactory); | 787 dicomServer.SetFindRequestHandlerFactory(serverFactory); |
788 dicomServer.SetAssociationTimeout(Configuration::GetGlobalUnsignedIntegerParameter("DicomScpTimeout", 30)); | 788 dicomServer.SetAssociationTimeout(Configuration::GetGlobalUnsignedIntegerParameter("DicomScpTimeout", 30)); |
789 | 789 |
790 | 790 |
791 #if ORTHANC_PLUGINS_ENABLED == 1 | 791 #if ORTHANC_ENABLE_PLUGINS == 1 |
792 if (plugins != NULL) | 792 if (plugins != NULL) |
793 { | 793 { |
794 if (plugins->HasWorklistHandler()) | 794 if (plugins->HasWorklistHandler()) |
795 { | 795 { |
796 dicomServer.SetWorklistRequestHandlerFactory(*plugins); | 796 dicomServer.SetWorklistRequestHandlerFactory(*plugins); |
850 | 850 |
851 | 851 |
852 static bool ConfigureHttpHandler(ServerContext& context, | 852 static bool ConfigureHttpHandler(ServerContext& context, |
853 OrthancPlugins *plugins) | 853 OrthancPlugins *plugins) |
854 { | 854 { |
855 #if ORTHANC_PLUGINS_ENABLED == 1 | 855 #if ORTHANC_ENABLE_PLUGINS == 1 |
856 // By order of priority, first apply the "plugins" layer, so that | 856 // By order of priority, first apply the "plugins" layer, so that |
857 // plugins can overwrite the built-in REST API of Orthanc | 857 // plugins can overwrite the built-in REST API of Orthanc |
858 if (plugins) | 858 if (plugins) |
859 { | 859 { |
860 assert(context.HasPlugins()); | 860 assert(context.HasPlugins()); |
966 context.GetIndex().SetMaximumStorageSize(0); | 966 context.GetIndex().SetMaximumStorageSize(0); |
967 } | 967 } |
968 | 968 |
969 LoadLuaScripts(context); | 969 LoadLuaScripts(context); |
970 | 970 |
971 #if ORTHANC_PLUGINS_ENABLED == 1 | 971 #if ORTHANC_ENABLE_PLUGINS == 1 |
972 if (plugins) | 972 if (plugins) |
973 { | 973 { |
974 plugins->SetServerContext(context); | 974 plugins->SetServerContext(context); |
975 context.SetPlugins(*plugins); | 975 context.SetPlugins(*plugins); |
976 } | 976 } |
988 error = e.GetErrorCode(); | 988 error = e.GetErrorCode(); |
989 } | 989 } |
990 | 990 |
991 context.Stop(); | 991 context.Stop(); |
992 | 992 |
993 #if ORTHANC_PLUGINS_ENABLED == 1 | 993 #if ORTHANC_ENABLE_PLUGINS == 1 |
994 if (plugins) | 994 if (plugins) |
995 { | 995 { |
996 plugins->ResetServerContext(); | 996 plugins->ResetServerContext(); |
997 context.ResetPlugins(); | 997 context.ResetPlugins(); |
998 } | 998 } |
1032 bool allowDatabaseUpgrade) | 1032 bool allowDatabaseUpgrade) |
1033 { | 1033 { |
1034 std::auto_ptr<IDatabaseWrapper> databasePtr; | 1034 std::auto_ptr<IDatabaseWrapper> databasePtr; |
1035 std::auto_ptr<IStorageArea> storage; | 1035 std::auto_ptr<IStorageArea> storage; |
1036 | 1036 |
1037 #if ORTHANC_PLUGINS_ENABLED == 1 | 1037 #if ORTHANC_ENABLE_PLUGINS == 1 |
1038 OrthancPlugins plugins; | 1038 OrthancPlugins plugins; |
1039 plugins.SetCommandLineArguments(argc, argv); | 1039 plugins.SetCommandLineArguments(argc, argv); |
1040 LoadPlugins(plugins); | 1040 LoadPlugins(plugins); |
1041 | 1041 |
1042 IDatabaseWrapper* database = NULL; | 1042 IDatabaseWrapper* database = NULL; |
1064 assert(database != NULL); | 1064 assert(database != NULL); |
1065 assert(storage.get() != NULL); | 1065 assert(storage.get() != NULL); |
1066 | 1066 |
1067 return ConfigureDatabase(*database, *storage, &plugins, allowDatabaseUpgrade); | 1067 return ConfigureDatabase(*database, *storage, &plugins, allowDatabaseUpgrade); |
1068 | 1068 |
1069 #elif ORTHANC_PLUGINS_ENABLED == 0 | 1069 #elif ORTHANC_ENABLE_PLUGINS == 0 |
1070 // The plugins are disabled | 1070 // The plugins are disabled |
1071 databasePtr.reset(Configuration::CreateDatabaseWrapper()); | 1071 databasePtr.reset(Configuration::CreateDatabaseWrapper()); |
1072 storage.reset(Configuration::CreateStorageArea()); | 1072 storage.reset(Configuration::CreateStorageArea()); |
1073 | 1073 |
1074 return ConfigureDatabase(*databasePtr, *storage, NULL, allowDatabaseUpgrade); | 1074 return ConfigureDatabase(*databasePtr, *storage, NULL, allowDatabaseUpgrade); |
1075 | 1075 |
1076 #else | 1076 #else |
1077 # error The macro ORTHANC_PLUGINS_ENABLED must be set to 0 or 1 | 1077 # error The macro ORTHANC_ENABLE_PLUGINS must be set to 0 or 1 |
1078 #endif | 1078 #endif |
1079 } | 1079 } |
1080 | 1080 |
1081 | 1081 |
1082 static bool StartOrthanc(int argc, | 1082 static bool StartOrthanc(int argc, |