# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1432722763 -7200
# Node ID 7b6f5115607f82f039b1370f83e69305962e65c7
# Parent  b22ba8c5edbefe2b12e6d06926c56ccfe33ed3e2# Parent  4460e2622016b97b720600adb508452eba034444
integration mainline->query-retrieve

diff -r b22ba8c5edbe -r 7b6f5115607f OrthancServer/OrthancRestApi/OrthancRestSystem.cpp
--- 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);
   }