# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1681577085 -7200
# Node ID 07622792f862b6a4d38faa5bc6ec1068bb231522
# Parent  e25f4500b531b0347020f4e1120214d4e75eb88f# Parent  614031f7a16d3b340b98aab4650ae5641ada2786
back to mainline

diff -r e25f4500b531 -r 07622792f862 Framework/Plugins/IndexBackend.cpp
--- a/Framework/Plugins/IndexBackend.cpp	Sat Apr 15 14:55:21 2023 +0200
+++ b/Framework/Plugins/IndexBackend.cpp	Sat Apr 15 18:44:45 2023 +0200
@@ -2384,9 +2384,7 @@
   }
 
 
-#if defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE)      // Macro introduced in 1.3.1
-#  if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 4)
-  // New primitive since Orthanc 1.5.4
+// New primitive since Orthanc 1.5.4
 bool IndexBackend::LookupResourceAndParent(int64_t& id,
                                            OrthancPluginResourceType& type,
                                            std::string& parentPublicId,
@@ -2444,12 +2442,8 @@
     return true;
   }
 }
-#  endif
-#endif
   
 
-#if defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE)      // Macro introduced in 1.3.1
-#  if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 4)
   // New primitive since Orthanc 1.5.4
   void IndexBackend::GetAllMetadata(std::map<int32_t, std::string>& result,
                                     DatabaseManager& manager,
@@ -2486,8 +2480,6 @@
       }
     }
   }
-#  endif
-#endif
 
 
 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
diff -r e25f4500b531 -r 07622792f862 PostgreSQL/CMakeLists.txt
diff -r e25f4500b531 -r 07622792f862 PostgreSQL/NEWS
--- a/PostgreSQL/NEWS	Sat Apr 15 14:55:21 2023 +0200
+++ b/PostgreSQL/NEWS	Sat Apr 15 18:44:45 2023 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Release 5.0 (2023-04-15)
+========================
+
 * Compatibility with Orthanc SDK 1.12.0 (communications between the
   Orthanc core and the database plugin using Google Protocol Buffers)
 * Upgraded dependencies for static builds (notably on Windows and LSB):