Mercurial > hg > orthanc
diff OrthancServer/OrthancRestApi.cpp @ 62:a70bb32802ae orthanc-renaming
renaming Server
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sun, 16 Sep 2012 09:33:19 +0200 |
parents | 6da7fc87efaa |
children | b8dfde8d64e8 |
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi.cpp Sun Sep 16 09:30:31 2012 +0200 +++ b/OrthancServer/OrthancRestApi.cpp Sun Sep 16 09:33:19 2012 +0200 @@ -1,5 +1,5 @@ /** - * Palanthir - A Lightweight, RESTful DICOM Store + * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012 Medical Physics Department, CHU of Liege, * Belgium * @@ -18,9 +18,9 @@ **/ -#include "PalanthirRestApi.h" +#include "OrthancRestApi.h" -#include "PalanthirInitialization.h" +#include "OrthancInitialization.h" #include "FromDcmtkBridge.h" #include "../Core/Uuid.h" @@ -28,7 +28,7 @@ #include <dcmtk/dcmdata/dcfilefo.h> #include <boost/lexical_cast.hpp> -namespace Palanthir +namespace Orthanc { static void SendJson(HttpOutput& output, const Json::Value& value) @@ -96,14 +96,14 @@ Json::Reader reader; if (!reader.parse(s, source)) { - throw PalanthirException("Corrupted JSON file"); + throw OrthancException("Corrupted JSON file"); } SimplifyTagsRecursion(target, source); } - bool PalanthirRestApi::Store(Json::Value& result, + bool OrthancRestApi::Store(Json::Value& result, const std::string& postData) { // Prepare an input stream for the memory buffer @@ -156,20 +156,20 @@ return false; } - void PalanthirRestApi::ConnectToModality(DicomUserConnection& c, + void OrthancRestApi::ConnectToModality(DicomUserConnection& c, const std::string& name) { std::string aet, address; int port; GetDicomModality(name, aet, address, port); - c.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "PALANTHIR")); + c.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); c.SetDistantApplicationEntityTitle(aet); c.SetDistantHost(address); c.SetDistantPort(port); c.Open(); } - bool PalanthirRestApi::MergeQueryAndTemplate(DicomMap& result, + bool OrthancRestApi::MergeQueryAndTemplate(DicomMap& result, const std::string& postData) { Json::Value query; @@ -191,7 +191,7 @@ return true; } - bool PalanthirRestApi::DicomFindPatient(Json::Value& result, + bool OrthancRestApi::DicomFindPatient(Json::Value& result, DicomUserConnection& c, const std::string& postData) { @@ -208,7 +208,7 @@ return true; } - bool PalanthirRestApi::DicomFindStudy(Json::Value& result, + bool OrthancRestApi::DicomFindStudy(Json::Value& result, DicomUserConnection& c, const std::string& postData) { @@ -231,7 +231,7 @@ return true; } - bool PalanthirRestApi::DicomFindSeries(Json::Value& result, + bool OrthancRestApi::DicomFindSeries(Json::Value& result, DicomUserConnection& c, const std::string& postData) { @@ -255,7 +255,7 @@ return true; } - bool PalanthirRestApi::DicomFind(Json::Value& result, + bool OrthancRestApi::DicomFind(Json::Value& result, DicomUserConnection& c, const std::string& postData) { @@ -325,7 +325,7 @@ - bool PalanthirRestApi::DicomStore(Json::Value& result, + bool OrthancRestApi::DicomStore(Json::Value& result, DicomUserConnection& c, const std::string& postData) { @@ -371,7 +371,7 @@ } - PalanthirRestApi::PalanthirRestApi(ServerIndex& index, + OrthancRestApi::OrthancRestApi(ServerIndex& index, const std::string& path) : index_(index), storage_(path) @@ -380,7 +380,7 @@ } - void PalanthirRestApi::Handle( + void OrthancRestApi::Handle( HttpOutput& output, const std::string& method, const UriComponents& uri, @@ -426,7 +426,7 @@ } else { - output.SendHeader(Palanthir_HttpStatus_415_UnsupportedMediaType); + output.SendHeader(Orthanc_HttpStatus_415_UnsupportedMediaType); return; } } @@ -647,13 +647,13 @@ } else { - throw PalanthirException(ErrorCode_InternalError); + throw OrthancException(ErrorCode_InternalError); } output.AnswerBufferWithContentType(png, "image/png"); return; } - catch (PalanthirException&) + catch (OrthancException&) { output.Redirect("/app/images/Unsupported.png"); return; @@ -681,7 +681,7 @@ } catch (boost::bad_lexical_cast) { - output.SendHeader(Palanthir_HttpStatus_400_BadRequest); + output.SendHeader(Orthanc_HttpStatus_400_BadRequest); return; } @@ -692,7 +692,7 @@ if (!index_.GetChanges(result, since, filter, limit)) { - output.SendHeader(Palanthir_HttpStatus_400_BadRequest); + output.SendHeader(Orthanc_HttpStatus_400_BadRequest); return; } @@ -782,7 +782,7 @@ (uri[2] == "find" && !DicomFind(result, connection, postData)) || (uri[2] == "store" && !DicomStore(result, connection, postData))) { - output.SendHeader(Palanthir_HttpStatus_400_BadRequest); + output.SendHeader(Orthanc_HttpStatus_400_BadRequest); return; } } @@ -796,7 +796,7 @@ } else { - output.SendHeader(Palanthir_HttpStatus_404_NotFound); + output.SendHeader(Orthanc_HttpStatus_404_NotFound); } } }