# HG changeset patch
# User Alain Mazy <am@osimis.io>
# Date 1637838854 -3600
# Node ID 58637d39ce88a9175f5d2e355387a05e674b49b1
# Parent  cd6dc99e0470c11484c6fecf0448349a697d994b# Parent  46bfa3a4fd6329b58424c5ab2d67dc027e551196
merge

diff -r cd6dc99e0470 -r 58637d39ce88 OrthancFramework/Sources/SQLite/Transaction.h
--- a/OrthancFramework/Sources/SQLite/Transaction.h	Thu Nov 25 12:13:53 2021 +0100
+++ b/OrthancFramework/Sources/SQLite/Transaction.h	Thu Nov 25 12:14:14 2021 +0100
@@ -61,11 +61,11 @@
       // Returns true when there is a transaction that has been successfully begun.
       bool IsOpen() const;
 
-      virtual void Begin();
+      virtual void Begin() ORTHANC_OVERRIDE;
 
-      virtual void Rollback();
+      virtual void Rollback() ORTHANC_OVERRIDE;
 
-      virtual void Commit();
+      virtual void Commit() ORTHANC_OVERRIDE;
     };
   }
 }
diff -r cd6dc99e0470 -r 58637d39ce88 OrthancServer/Sources/ServerJobs/ArchiveJob.cpp
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Thu Nov 25 12:13:53 2021 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Thu Nov 25 12:14:14 2021 +0100
@@ -149,7 +149,7 @@
   class ArchiveJob::ThreadedInstanceLoader : public ArchiveJob::InstanceLoader
   {
     Semaphore                           availableInstancesSemaphore_;
-    std::map<std::string, boost::shared_ptr<std::string>>  availableInstances_;
+    std::map<std::string, boost::shared_ptr<std::string> >  availableInstances_;
     boost::mutex                        availableInstancesMutex_;
     SharedMessageQueue                  instancesToPreload_;
     std::vector<boost::thread*>         threads_;
diff -r cd6dc99e0470 -r 58637d39ce88 OrthancServer/UnitTestsSources/PluginsTests.cpp
--- a/OrthancServer/UnitTestsSources/PluginsTests.cpp	Thu Nov 25 12:13:53 2021 +0100
+++ b/OrthancServer/UnitTestsSources/PluginsTests.cpp	Thu Nov 25 12:14:14 2021 +0100
@@ -34,6 +34,7 @@
 #include "PrecompiledHeadersUnitTests.h"
 #include <gtest/gtest.h>
 
+#include "../../OrthancFramework/Sources/Compatibility.h"
 #include "../../OrthancFramework/Sources/OrthancException.h"
 #include "../Plugins/Engine/PluginsManager.h"
 
@@ -86,11 +87,25 @@
   //ASSERT_TRUE(l.HasFunction("_init"));
   
 #elif defined(__linux__) || defined(__FreeBSD_kernel__)
-  SharedLibrary l("libdl.so");
-  ASSERT_THROW(l.GetFunction("world"), OrthancException);
-  ASSERT_TRUE(l.GetFunction("dlopen") != NULL);
-  ASSERT_TRUE(l.HasFunction("dlclose"));
-  ASSERT_FALSE(l.HasFunction("world"));
+  std::unique_ptr<SharedLibrary> l;
+  try
+  {
+    /**
+     * Since Orthanc 1.9.8, we test the "libdl.so.2" instead of the
+     * "libdl.so", as discussed here:
+     * https://groups.google.com/g/orthanc-users/c/I5g1fN6MCvg/m/JVdvRyjJAAAJ
+     **/
+    l.reset(new SharedLibrary("libdl.so.2"));
+  }
+  catch (OrthancException&)
+  {
+    l.reset(new SharedLibrary("libdl.so")); // Fallback for backward compat
+  }
+  
+  ASSERT_THROW(l->GetFunction("world"), OrthancException);
+  ASSERT_TRUE(l->GetFunction("dlopen") != NULL);
+  ASSERT_TRUE(l->HasFunction("dlclose"));
+  ASSERT_FALSE(l->HasFunction("world"));
 
 #elif defined(__FreeBSD__) || defined(__OpenBSD__)
   // dlopen() in FreeBSD/OpenBSD is supplied by libc, libc.so is
diff -r cd6dc99e0470 -r 58637d39ce88 TODO
--- a/TODO	Thu Nov 25 12:13:53 2021 +0100
+++ b/TODO	Thu Nov 25 12:14:14 2021 +0100
@@ -36,7 +36,15 @@
 * Discuss HL7 in a dedicated page:
   https://groups.google.com/d/msg/orthanc-users/4dt4992O0lQ/opTjTFU2BgAJ
   https://groups.google.com/g/orthanc-users/c/Spjtcj9vSPo/m/ktUArWxUDQAJ
-  
+
+
+================
+Orthanc Explorer
+================
+
+* Option to tune the number of results for a local lookup:
+  https://groups.google.com/g/orthanc-users/c/LF39musq02Y/
+
 
 ========
 REST API