Mercurial > hg > orthanc

changeset 3052:c7db469bbe8e db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new class: Compatibility::DatabaseLookup
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 Dec 2018 16:58:52 +0100
parents 39db63e68dcf
children 3f986ce336c8
files CMakeLists.txt OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h OrthancServer/Search/Compatibility/DatabaseLookup.cpp OrthancServer/Search/Compatibility/DatabaseLookup.h OrthancServer/Search/Compatibility/SetOfResources.cpp Plugins/Engine/OrthancPluginDatabase.cpp Plugins/Engine/OrthancPluginDatabase.h
diffstat 7 files changed, 144 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu Dec 20 16:49:07 2018 +0100
+++ b/CMakeLists.txt	Thu Dec 20 16:58:52 2018 +0100
@@ -71,6 +71,7 @@
   OrthancServer/OrthancRestApi/OrthancRestSystem.cpp
   OrthancServer/QueryRetrieveHandler.cpp
   OrthancServer/SQLiteDatabaseWrapper.cpp
+  OrthancServer/Search/Compatibility/DatabaseLookup.cpp
   OrthancServer/Search/Compatibility/SetOfResources.cpp
   OrthancServer/Search/DatabaseConstraint.cpp
   OrthancServer/Search/DatabaseLookup.cpp
--- a/OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h	Thu Dec 20 16:49:07 2018 +0100
+++ b/OrthancServer/Search/Compatibility/CompatibilityDatabaseWrapper.h	Thu Dec 20 16:58:52 2018 +0100
@@ -37,24 +37,27 @@
 
 namespace Orthanc
 {
-  /**
-   * This is a compatibility class that contains database primitives
-   * that were used in Orthanc <= 1.5.1, and that have been removed
-   * during the optimization of the database engine.
-   **/
-  class CompatibilityDatabaseWrapper : public IDatabaseWrapper
+  namespace Compatibility
   {
-  public:
-    virtual void LookupIdentifier(std::list<int64_t>& result,
-                                  ResourceType level,
-                                  const DicomTag& tag,
-                                  IdentifierConstraintType type,
-                                  const std::string& value) = 0;
+    /**
+     * This is a compatibility class that contains database primitives
+     * that were used in Orthanc <= 1.5.1, and that have been removed
+     * during the optimization of the database engine.
+     **/
+    class CompatibilityDatabaseWrapper : public IDatabaseWrapper
+    {
+    public:
+      virtual void LookupIdentifier(std::list<int64_t>& result,
+                                    ResourceType level,
+                                    const DicomTag& tag,
+                                    IdentifierConstraintType type,
+                                    const std::string& value) = 0;
  
-    virtual void LookupIdentifierRange(std::list<int64_t>& result,
-                                       ResourceType level,
-                                       const DicomTag& tag,
-                                       const std::string& start,
-                                       const std::string& end) = 0;
-  };
+      virtual void LookupIdentifierRange(std::list<int64_t>& result,
+                                         ResourceType level,
+                                         const DicomTag& tag,
+                                         const std::string& start,
+                                         const std::string& end) = 0;
+    };
+  }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/Search/Compatibility/DatabaseLookup.cpp	Thu Dec 20 16:58:52 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 <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "../../PrecompiledHeadersServer.h"
+#include "DatabaseLookup.h"
+
+#include "SetOfResources.h"
+#include "../../../Core/OrthancException.h"
+
+namespace Orthanc
+{
+  namespace Compatibility
+  {  
+    void DatabaseLookup::ApplyLookupResources(std::vector<std::string>& patientsId,
+                                              std::vector<std::string>* instancesId,
+                                              const std::vector<DatabaseConstraint>& lookup,
+                                              ResourceType queryLevel,
+                                              size_t limit)
+    {
+      throw OrthancException(ErrorCode_NotImplemented);
+    }
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OrthancServer/Search/Compatibility/DatabaseLookup.h	Thu Dec 20 16:58:52 2018 +0100
@@ -0,0 +1,60 @@
+/**
+ * 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 <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "CompatibilityDatabaseWrapper.h"
+
+namespace Orthanc
+{
+  namespace Compatibility
+  {
+    class DatabaseLookup : public boost::noncopyable
+    {
+    private:
+      CompatibilityDatabaseWrapper&  database_;
+
+    public:
+      DatabaseLookup(CompatibilityDatabaseWrapper& database) :
+        database_(database)
+      {
+      }
+
+      void ApplyLookupResources(std::vector<std::string>& patientsId,
+                                std::vector<std::string>* instancesId,
+                                const std::vector<DatabaseConstraint>& lookup,
+                                ResourceType queryLevel,
+                                size_t limit);
+    };
+  }
+}
--- a/OrthancServer/Search/Compatibility/SetOfResources.cpp	Thu Dec 20 16:49:07 2018 +0100
+++ b/OrthancServer/Search/Compatibility/SetOfResources.cpp	Thu Dec 20 16:58:52 2018 +0100
@@ -31,10 +31,10 @@
  **/
 
 
-#include "../../OrthancServer/PrecompiledHeadersServer.h"
+#include "../../PrecompiledHeadersServer.h"
 #include "SetOfResources.h"
 
-#include "../../Core/OrthancException.h"
+#include "../../../Core/OrthancException.h"
 
 
 namespace Orthanc
--- a/Plugins/Engine/OrthancPluginDatabase.cpp	Thu Dec 20 16:49:07 2018 +0100
+++ b/Plugins/Engine/OrthancPluginDatabase.cpp	Thu Dec 20 16:58:52 2018 +0100
@@ -39,8 +39,9 @@
 #endif
 
 
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
-#include "../../Core/Logging.h"
+#include "../../OrthancServer/Search/Compatibility/DatabaseLookup.h"
 #include "PluginsEnumerations.h"
 
 #include <cassert>
@@ -63,7 +64,7 @@
 
   public:
     Transaction(OrthancPluginDatabase& that) :
-      that_(that)
+    that_(that)
     {
     }
 
@@ -1116,11 +1117,12 @@
                                                    ResourceType queryLevel,
                                                    size_t limit)
   {
-    throw OrthancException(ErrorCode_NotImplemented);
+    Compatibility::DatabaseLookup compat(*this);
+    compat.ApplyLookupResources(patientsId, instancesId, lookup, queryLevel, limit);
   }
 
 
-    void OrthancPluginDatabase::LookupIdentifier(std::list<int64_t>& result,
+  void OrthancPluginDatabase::LookupIdentifier(std::list<int64_t>& result,
                                                ResourceType level,
                                                const DicomTag& tag,
                                                IdentifierConstraintType type,
--- a/Plugins/Engine/OrthancPluginDatabase.h	Thu Dec 20 16:49:07 2018 +0100
+++ b/Plugins/Engine/OrthancPluginDatabase.h	Thu Dec 20 16:58:52 2018 +0100
@@ -42,7 +42,7 @@
 
 namespace Orthanc
 {
-  class OrthancPluginDatabase : public CompatibilityDatabaseWrapper
+  class OrthancPluginDatabase : public Compatibility::CompatibilityDatabaseWrapper
   {
   private:
     class Transaction;