Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi/OrthancRestSystem.cpp @ 2069:fabf7820d1f1
New configuration options: "DicomScuTimeout" and "DicomScpTimeout" + validation of non-negative options
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 13 Jul 2016 16:52:39 +0200 |
parents | b1291df2f780 |
children | dd609a99d39a |
comparison
equal
deleted
inserted
replaced
2068:879f3be759ef | 2069:fabf7820d1f1 |
---|---|
53 { | 53 { |
54 Json::Value result = Json::objectValue; | 54 Json::Value result = Json::objectValue; |
55 | 55 |
56 result["DatabaseVersion"] = OrthancRestApi::GetIndex(call).GetDatabaseVersion(); | 56 result["DatabaseVersion"] = OrthancRestApi::GetIndex(call).GetDatabaseVersion(); |
57 result["DicomAet"] = Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"); | 57 result["DicomAet"] = Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC"); |
58 result["DicomPort"] = Configuration::GetGlobalIntegerParameter("DicomPort", 4242); | 58 result["DicomPort"] = Configuration::GetGlobalUnsignedIntegerParameter("DicomPort", 4242); |
59 result["HttpPort"] = Configuration::GetGlobalIntegerParameter("HttpPort", 8042); | 59 result["HttpPort"] = Configuration::GetGlobalUnsignedIntegerParameter("HttpPort", 8042); |
60 result["Name"] = Configuration::GetGlobalStringParameter("Name", ""); | 60 result["Name"] = Configuration::GetGlobalStringParameter("Name", ""); |
61 result["Version"] = ORTHANC_VERSION; | 61 result["Version"] = ORTHANC_VERSION; |
62 | 62 |
63 result["StorageAreaPlugin"] = Json::nullValue; | 63 result["StorageAreaPlugin"] = Json::nullValue; |
64 result["DatabaseBackendPlugin"] = Json::nullValue; | 64 result["DatabaseBackendPlugin"] = Json::nullValue; |