# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1549652101 -3600
# Node ID 39b2f29ddf3ce40b8cc6cbb943026e55ebc4364c
# Parent  de1dbd841e2b3fdb6cf47b1058f38e5bb1258610# Parent  3424a54ca2ee52448369fd249af954d225164e62
integration OrthancPostgreSQL-3.1 to mainline

diff -r de1dbd841e2b -r 39b2f29ddf3c Framework/Plugins/OrthancCppDatabasePlugin.h
--- a/Framework/Plugins/OrthancCppDatabasePlugin.h	Fri Feb 08 18:43:02 2019 +0100
+++ b/Framework/Plugins/OrthancCppDatabasePlugin.h	Fri Feb 08 19:55:01 2019 +0100
@@ -1841,13 +1841,13 @@
 #  endif
 #endif
 
-  if (performanceWarning)
+      if (performanceWarning)
       {
         char info[1024];
         sprintf(info, 
                 "Performance warning: The database index plugin was compiled "
                 "against an old version of the Orthanc SDK (%d.%d.%d): "
-                "Consider upgrading to version 1.5.2 of the Orthanc SDK",
+                "Consider upgrading to version 1.5.4 of the Orthanc SDK",
                 ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER,
                 ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER,
                 ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER);
diff -r de1dbd841e2b -r 39b2f29ddf3c Framework/Plugins/PluginInitialization.cpp
--- a/Framework/Plugins/PluginInitialization.cpp	Fri Feb 08 18:43:02 2019 +0100
+++ b/Framework/Plugins/PluginInitialization.cpp	Fri Feb 08 19:55:01 2019 +0100
@@ -65,7 +65,7 @@
       return false;
     }
 
-    if (OrthancPluginCheckVersionAdvanced(context, 1, 4, 0) == 1)
+    if (OrthancPluginCheckVersionAdvanced(context, 1, 5, 4) == 1)
     {
       ImplicitTransaction::SetErrorOnDoubleExecution(true);
       isOptimal = true;
@@ -111,8 +111,8 @@
         int revision = boost::lexical_cast<int>(tokens[2]);
 
         isOptimal = (major > 1 ||
-                     (major == 1 && minor > 4) ||
-                     (major == 1 && minor == 4 && revision >= 0));
+                     (major == 1 && minor > 5) ||
+                     (major == 1 && minor == 5 && revision >= 4));
       }
     }
 
@@ -121,7 +121,7 @@
     {
       LOG(WARNING) << "Performance warning in " << dbms
                    << " index: Your version of Orthanc (" 
-                   << context->orthancVersion << ") should be upgraded to 1.5.2 "
+                   << context->orthancVersion << ") should be upgraded to 1.5.4 "
                    << "to benefit from best performance";
     }