Mercurial > hg > orthanc
comparison OrthancServer/main.cpp @ 1811:67466dcd23b1
integration worklists->mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 23 Nov 2015 17:10:11 +0100 |
parents | 5ed8769b17f9 |
children | d364926389e0 |
comparison
equal
deleted
inserted
replaced
1806:cd213ebcaefd | 1811:67466dcd23b1 |
---|---|
734 dicomServer.SetStoreRequestHandlerFactory(serverFactory); | 734 dicomServer.SetStoreRequestHandlerFactory(serverFactory); |
735 dicomServer.SetMoveRequestHandlerFactory(serverFactory); | 735 dicomServer.SetMoveRequestHandlerFactory(serverFactory); |
736 dicomServer.SetFindRequestHandlerFactory(serverFactory); | 736 dicomServer.SetFindRequestHandlerFactory(serverFactory); |
737 | 737 |
738 #if ORTHANC_PLUGINS_ENABLED == 1 | 738 #if ORTHANC_PLUGINS_ENABLED == 1 |
739 if (plugins) | 739 if (plugins && |
740 plugins->HasWorklistHandler()) | |
740 { | 741 { |
741 dicomServer.SetWorklistRequestHandlerFactory(*plugins); | 742 dicomServer.SetWorklistRequestHandlerFactory(*plugins); |
742 } | 743 } |
743 #endif | 744 #endif |
744 | 745 |
1104 { | 1105 { |
1105 for (;;) | 1106 for (;;) |
1106 { | 1107 { |
1107 OrthancInitialize(configurationFile); | 1108 OrthancInitialize(configurationFile); |
1108 | 1109 |
1110 if (0) | |
1111 { | |
1112 // TODO REMOVE THIS TEST | |
1113 DicomUserConnection c; | |
1114 c.SetRemoteHost("localhost"); | |
1115 c.SetRemotePort(4243); | |
1116 c.SetRemoteApplicationEntityTitle("ORTHANCTEST"); | |
1117 c.Open(); | |
1118 ParsedDicomFile f(false); | |
1119 f.Replace(DICOM_TAG_PATIENT_NAME, "M*"); | |
1120 DicomFindAnswers a; | |
1121 c.FindWorklist(a, f); | |
1122 Json::Value j; | |
1123 a.ToJson(j, true); | |
1124 std::cout << j; | |
1125 } | |
1126 | |
1109 bool restart = StartOrthanc(argc, argv, allowDatabaseUpgrade); | 1127 bool restart = StartOrthanc(argc, argv, allowDatabaseUpgrade); |
1110 if (restart) | 1128 if (restart) |
1111 { | 1129 { |
1112 OrthancFinalize(); | 1130 OrthancFinalize(); |
1113 } | 1131 } |