Mercurial > hg > orthanc-authorization
changeset 44:963202c5abcf
back to mainline
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 10 Dec 2020 14:52:30 +0100 |
| parents | 5ec8c70cbcf6 (current diff) 14594077ad3a (diff) |
| children | 0ddba2f3aec6 |
| files | CMakeLists.txt |
| diffstat | 8 files changed, 29 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Nov 06 18:13:13 2020 +0100 +++ b/CMakeLists.txt Thu Dec 10 14:52:30 2020 +0100 @@ -25,7 +25,7 @@ set(ORTHANC_FRAMEWORK_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_VERSION "1.4.0") + set(ORTHANC_FRAMEWORK_VERSION "1.8.1") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif()
--- a/NEWS Fri Nov 06 18:13:13 2020 +0100 +++ b/NEWS Thu Dec 10 14:52:30 2020 +0100 @@ -1,25 +1,35 @@ Pending changes in the mainline =============================== +NB: This plugin is now deprecated. + + +2020-12-10 - v 0.2.4 +==================== + * Added support for Osimis Web Viewer new route (osimis-viewer/custom-command/) * Support of dynamic linking against the system-wide Orthanc framework library + 2018-08-13 - v 0.2.3 ==================== * Compatibility with Linux Standard Base * Now using the Orthanc framework + 2018-07-19 - v 0.2.2 ==================== * Added automated build + 2018-03-09 - v 0.2.1 ==================== * Upgraded sdk to 1.3.1 + 2018-03-08 - v 0.2.0 ====================
--- a/Plugin/AuthorizationParserBase.h Fri Nov 06 18:13:13 2020 +0100 +++ b/Plugin/AuthorizationParserBase.h Thu Dec 10 14:52:30 2020 +0100 @@ -60,10 +60,10 @@ const std::string& instanceDicomUid); public: - AuthorizationParserBase(ICacheFactory& factory); + explicit AuthorizationParserBase(ICacheFactory& factory); virtual void Invalidate(Orthanc::ResourceType level, - const std::string& id) + const std::string& id) ORTHANC_OVERRIDE { resourceHierarchy_->Invalidate(level, id); }
--- a/Plugin/CachedAuthorizationService.h Fri Nov 06 18:13:13 2020 +0100 +++ b/Plugin/CachedAuthorizationService.h Thu Dec 10 14:52:30 2020 +0100 @@ -49,10 +49,10 @@ OrthancPluginHttpMethod method, const AccessedResource& access, const Token& token, - const std::string& tokenValue); + const std::string& tokenValue) ORTHANC_OVERRIDE; virtual bool IsGranted(unsigned int& validity, OrthancPluginHttpMethod method, - const AccessedResource& access); + const AccessedResource& access) ORTHANC_OVERRIDE; }; }
--- a/Plugin/MemoryCache.h Fri Nov 06 18:13:13 2020 +0100 +++ b/Plugin/MemoryCache.h Thu Dec 10 14:52:30 2020 +0100 @@ -35,12 +35,12 @@ unsigned int maxSize_; public: - Factory(unsigned int maxSize) : + explicit Factory(unsigned int maxSize) : maxSize_(maxSize) { } - virtual ICache *Create() + virtual ICache *Create() ORTHANC_OVERRIDE { return new MemoryCache(maxSize_); } @@ -60,17 +60,17 @@ void InvalidateInternal(const std::string& key); public: - MemoryCache(unsigned int maxSize); + explicit MemoryCache(unsigned int maxSize); ~MemoryCache(); - virtual void Invalidate(const std::string& key); + virtual void Invalidate(const std::string& key) ORTHANC_OVERRIDE; virtual void Store(const std::string& key, const std::string& value, - unsigned int expiration /* in seconds */); + unsigned int expiration /* in seconds */) ORTHANC_OVERRIDE; virtual bool Retrieve(std::string& value, - const std::string& key); + const std::string& key) ORTHANC_OVERRIDE; }; }
--- a/Plugin/ResourceHierarchyCache.cpp Fri Nov 06 18:13:13 2020 +0100 +++ b/Plugin/ResourceHierarchyCache.cpp Thu Dec 10 14:52:30 2020 +0100 @@ -26,7 +26,7 @@ namespace OrthancPlugins { std::string ResourceHierarchyCache::ComputeKey(Orthanc::ResourceType level, - const std::string identifier) const + const std::string& identifier) const { return boost::lexical_cast<std::string>(level) + "|" + identifier; } @@ -183,8 +183,6 @@ return true; } - OrthancResource resource(level, dicomUid); - if (OrthancResource::LookupOrthancId(target, level, dicomUid)) { dicomToOrthanc_->Store(key, target, 0 /* no expiration */);
--- a/Plugin/ResourceHierarchyCache.h Fri Nov 06 18:13:13 2020 +0100 +++ b/Plugin/ResourceHierarchyCache.h Thu Dec 10 14:52:30 2020 +0100 @@ -36,7 +36,7 @@ std::unique_ptr<ICache> dicomToOrthanc_; std::string ComputeKey(Orthanc::ResourceType level, - const std::string identifier) const; + const std::string& identifier) const; std::string ComputeKey(const OrthancResource& resource) const { @@ -57,7 +57,7 @@ } public: - ResourceHierarchyCache(ICacheFactory& factory); + explicit ResourceHierarchyCache(ICacheFactory& factory); void Invalidate(Orthanc::ResourceType level, const std::string& identifier);
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Fri Nov 06 18:13:13 2020 +0100 +++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Thu Dec 10 14:52:30 2020 +0100 @@ -118,6 +118,8 @@ set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0") elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0") set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.1") + set(ORTHANC_FRAMEWORK_MD5 "db094f96399cbe8b9bbdbce34884c220") # Below this point are development snapshots that were used to # release some plugin, before an official release of the Orthanc @@ -129,6 +131,9 @@ elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df") # DICOMweb 1.1 (framework pre-1.6.0) set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645") + elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "82652c5fc04f") + # Stone Web viewer 1.0 (framework pre-1.8.1) + set(ORTHANC_FRAMEWORK_MD5 "d77331d68917e66a3f4f9b807bbdab7f") endif() endif() endif()