changeset 1370:7b6f5115607f query-retrieve

integration mainline->query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 May 2015 12:32:43 +0200
parents b22ba8c5edbe (current diff) 4460e2622016 (diff)
children f528849ee9f7
files
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Tue May 26 17:54:34 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Wed May 27 12:32:43 2015 +0200
@@ -54,9 +54,14 @@
   {
     Json::Value result = Json::objectValue;
 
-    result["Version"] = ORTHANC_VERSION;
+    std::string dbVersion = OrthancRestApi::GetIndex(call).GetGlobalProperty(GlobalProperty_DatabaseSchemaVersion, "0");
+
+    result["DatabaseVersion"] = boost::lexical_cast<int>(dbVersion);
+    result["DicomAet"] = Configuration::GetGlobalStringParameter("DicomAet", "ORTHANC");
+    result["DicomPort"] = Configuration::GetGlobalIntegerParameter("DicomPort", 4242);
+    result["HttpPort"] = Configuration::GetGlobalIntegerParameter("HttpPort", 8042);
     result["Name"] = Configuration::GetGlobalStringParameter("Name", "");
-    result["DatabaseVersion"] = boost::lexical_cast<int>(OrthancRestApi::GetIndex(call).GetGlobalProperty(GlobalProperty_DatabaseSchemaVersion, "0"));
+    result["Version"] = ORTHANC_VERSION;
 
     call.GetOutput().AnswerJson(result);
   }