Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi.cpp @ 230:ae2367145b49
renames
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 30 Nov 2012 11:01:29 +0100 |
parents | f2349bab5fe7 |
children | 8098448bd827 |
comparison
equal
deleted
inserted
replaced
229:f2349bab5fe7 | 230:ae2367145b49 |
---|---|
28 * You should have received a copy of the GNU General Public License | 28 * You should have received a copy of the GNU General Public License |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
30 **/ | 30 **/ |
31 | 31 |
32 | 32 |
33 #include "OrthancRestApi2.h" | 33 #include "OrthancRestApi.h" |
34 | 34 |
35 #include "../Core/HttpServer/FilesystemHttpSender.h" | 35 #include "../Core/HttpServer/FilesystemHttpSender.h" |
36 #include "../Core/Uuid.h" | 36 #include "../Core/Uuid.h" |
37 #include "DicomProtocol/DicomUserConnection.h" | 37 #include "DicomProtocol/DicomUserConnection.h" |
38 #include "FromDcmtkBridge.h" | 38 #include "FromDcmtkBridge.h" |
44 #include <boost/lexical_cast.hpp> | 44 #include <boost/lexical_cast.hpp> |
45 #include <glog/logging.h> | 45 #include <glog/logging.h> |
46 | 46 |
47 | 47 |
48 #define RETRIEVE_CONTEXT(call) \ | 48 #define RETRIEVE_CONTEXT(call) \ |
49 OrthancRestApi2& contextApi = \ | 49 OrthancRestApi& contextApi = \ |
50 dynamic_cast<OrthancRestApi2&>(call.GetContext()); \ | 50 dynamic_cast<OrthancRestApi&>(call.GetContext()); \ |
51 ServerContext& context = contextApi.GetContext() | 51 ServerContext& context = contextApi.GetContext() |
52 | 52 |
53 #define RETRIEVE_MODALITIES(call) \ | 53 #define RETRIEVE_MODALITIES(call) \ |
54 const OrthancRestApi2::Modalities& modalities = \ | 54 const OrthancRestApi::Modalities& modalities = \ |
55 dynamic_cast<OrthancRestApi2&>(call.GetContext()).GetModalities(); | 55 dynamic_cast<OrthancRestApi&>(call.GetContext()).GetModalities(); |
56 | 56 |
57 | 57 |
58 | 58 |
59 namespace Orthanc | 59 namespace Orthanc |
60 { | 60 { |
540 } | 540 } |
541 | 541 |
542 | 542 |
543 // DICOM bridge ------------------------------------------------------------- | 543 // DICOM bridge ------------------------------------------------------------- |
544 | 544 |
545 static bool IsExistingModality(const OrthancRestApi2::Modalities& modalities, | 545 static bool IsExistingModality(const OrthancRestApi::Modalities& modalities, |
546 const std::string& id) | 546 const std::string& id) |
547 { | 547 { |
548 return modalities.find(id) != modalities.end(); | 548 return modalities.find(id) != modalities.end(); |
549 } | 549 } |
550 | 550 |
551 static void ListModalities(RestApi::GetCall& call) | 551 static void ListModalities(RestApi::GetCall& call) |
552 { | 552 { |
553 RETRIEVE_MODALITIES(call); | 553 RETRIEVE_MODALITIES(call); |
554 | 554 |
555 Json::Value result = Json::arrayValue; | 555 Json::Value result = Json::arrayValue; |
556 for (OrthancRestApi2::Modalities::const_iterator | 556 for (OrthancRestApi::Modalities::const_iterator |
557 it = modalities.begin(); it != modalities.end(); it++) | 557 it = modalities.begin(); it != modalities.end(); it++) |
558 { | 558 { |
559 result.append(*it); | 559 result.append(*it); |
560 } | 560 } |
561 | 561 |
582 | 582 |
583 | 583 |
584 | 584 |
585 // Registration of the various REST handlers -------------------------------- | 585 // Registration of the various REST handlers -------------------------------- |
586 | 586 |
587 OrthancRestApi2::OrthancRestApi2(ServerContext& context) : | 587 OrthancRestApi::OrthancRestApi(ServerContext& context) : |
588 context_(context) | 588 context_(context) |
589 { | 589 { |
590 GetListOfDicomModalities(modalities_); | 590 GetListOfDicomModalities(modalities_); |
591 | 591 |
592 Register("/", ServeRoot); | 592 Register("/", ServeRoot); |