# HG changeset patch # User Sebastien Jodogne # Date 1545397934 -3600 # Node ID 87f52703ebbc20efe038c133d3a0e1d0e7fc65a4 # Parent 6c5d4281da4aebf06e715531160659b7bbcd4d35 reorganization diff -r 6c5d4281da4a -r 87f52703ebbc CMakeLists.txt --- a/CMakeLists.txt Fri Dec 21 13:48:04 2018 +0100 +++ b/CMakeLists.txt Fri Dec 21 14:12:14 2018 +0100 @@ -71,6 +71,7 @@ OrthancServer/OrthancRestApi/OrthancRestSystem.cpp OrthancServer/QueryRetrieveHandler.cpp OrthancServer/SQLiteDatabaseWrapper.cpp + OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.cpp OrthancServer/Search/Compatibility/DatabaseLookup.cpp OrthancServer/Search/Compatibility/SetOfResources.cpp OrthancServer/Search/DatabaseConstraint.cpp diff -r 6c5d4281da4a -r 87f52703ebbc OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.cpp Fri Dec 21 14:12:14 2018 +0100 @@ -0,0 +1,53 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#include "../../PrecompiledHeadersServer.h" +#include "CompatibilityDatabaseWrapper.h" + +#include "DatabaseLookup.h" + +namespace Orthanc +{ + namespace Compatibility + { + void CompatibilityDatabaseWrapper::ApplyLookupResources(std::vector& resourcesId, + std::vector* instancesId, + const std::vector& lookup, + ResourceType queryLevel, + size_t limit) + { + Compatibility::DatabaseLookup compat(*this); + compat.ApplyLookupResources(resourcesId, instancesId, lookup, queryLevel, limit); + } + } +} diff -r 6c5d4281da4a -r 87f52703ebbc OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h --- a/OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h Fri Dec 21 13:48:04 2018 +0100 +++ b/OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h Fri Dec 21 14:12:14 2018 +0100 @@ -53,8 +53,15 @@ * during the optimization of the database engine. **/ class CompatibilityDatabaseWrapper : public IDatabaseWrapper - { + { public: + virtual void ApplyLookupResources(std::vector& resourcesId, + std::vector* instancesId, + const std::vector& lookup, + ResourceType queryLevel, + size_t limit) + ORTHANC_OVERRIDE; + virtual void GetAllInternalIds(std::list& target, ResourceType resourceType) = 0; diff -r 6c5d4281da4a -r 87f52703ebbc Plugins/Engine/OrthancPluginDatabase.cpp --- a/Plugins/Engine/OrthancPluginDatabase.cpp Fri Dec 21 13:48:04 2018 +0100 +++ b/Plugins/Engine/OrthancPluginDatabase.cpp Fri Dec 21 14:12:14 2018 +0100 @@ -41,7 +41,6 @@ #include "../../Core/Logging.h" #include "../../Core/OrthancException.h" -#include "../../OrthancServer/Search/Compatibility/DatabaseLookup.h" #include "PluginsEnumerations.h" #include @@ -1111,17 +1110,6 @@ } - void OrthancPluginDatabase::ApplyLookupResources(std::vector& resourcesId, - std::vector* instancesId, - const std::vector& lookup, - ResourceType queryLevel, - size_t limit) - { - Compatibility::DatabaseLookup compat(*this); - compat.ApplyLookupResources(resourcesId, instancesId, lookup, queryLevel, limit); - } - - void OrthancPluginDatabase::LookupIdentifier(std::list& result, ResourceType level, const DicomTag& tag, diff -r 6c5d4281da4a -r 87f52703ebbc Plugins/Engine/OrthancPluginDatabase.h --- a/Plugins/Engine/OrthancPluginDatabase.h Fri Dec 21 13:48:04 2018 +0100 +++ b/Plugins/Engine/OrthancPluginDatabase.h Fri Dec 21 14:12:14 2018 +0100 @@ -154,10 +154,6 @@ int64_t id) ORTHANC_OVERRIDE; - virtual void GetAllInternalIds(std::list& target, - ResourceType resourceType) - ORTHANC_OVERRIDE; - virtual void GetAllPublicIds(std::list& target, ResourceType resourceType) ORTHANC_OVERRIDE; @@ -311,11 +307,9 @@ virtual bool IsDiskSizeAbove(uint64_t threshold) ORTHANC_OVERRIDE; - virtual void ApplyLookupResources(std::vector& resourcesId, - std::vector* instancesId, - const std::vector& lookup, - ResourceType queryLevel, - size_t limit) + // From the "CompatibilityDatabaseWrapper" interface + virtual void GetAllInternalIds(std::list& target, + ResourceType resourceType) ORTHANC_OVERRIDE; // From the "CompatibilityDatabaseWrapper" interface