# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544887847 -3600
# Node ID 5db446c6b2dd279ad41d7fdde7e9daee600b668e
# Parent  d207f6ac1f86d9144d84df7875c386c47195f73e# Parent  2cbafb5d5a62993654d2ae3290ae7000b8c00276
integration mainline->db-changes

diff -r d207f6ac1f86 -r 5db446c6b2dd OrthancServer/OrthancFindRequestHandler.cpp
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Sat Dec 15 10:57:18 2018 +0100
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Sat Dec 15 16:30:47 2018 +0100
@@ -472,7 +472,7 @@
   }
 
 
-  class OrthancFindRequestHandler::LookupVisitor : public LookupResource::IVisitor
+  class OrthancFindRequestHandler::LookupVisitor : public ServerContext::ILookupVisitor
   {
   private:
     DicomFindAnswers&           answers_;
diff -r d207f6ac1f86 -r 5db446c6b2dd OrthancServer/OrthancRestApi/OrthancRestResources.cpp
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Sat Dec 15 10:57:18 2018 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Sat Dec 15 16:30:47 2018 +0100
@@ -1271,7 +1271,7 @@
 
   namespace 
   {
-    class FindVisitor : public LookupResource::IVisitor
+    class FindVisitor : public ServerContext::ILookupVisitor
     {
     private:
       bool                    isComplete_;
diff -r d207f6ac1f86 -r 5db446c6b2dd OrthancServer/Search/LookupResource.h
--- a/OrthancServer/Search/LookupResource.h	Sat Dec 15 10:57:18 2018 +0100
+++ b/OrthancServer/Search/LookupResource.h	Sat Dec 15 16:30:47 2018 +0100
@@ -84,23 +84,6 @@
                     IDatabaseWrapper& database) const;
 
   public:
-    class IVisitor : public boost::noncopyable
-    {
-    public:
-      virtual ~IVisitor()
-      {
-      }
-
-      virtual bool IsDicomAsJsonNeeded() const = 0;
-      
-      virtual void MarkAsComplete() = 0;
-
-      virtual void Visit(const std::string& publicId,
-                         const std::string& instanceId,
-                         const DicomMap& mainDicomTags,
-                         const Json::Value* dicomAsJson) = 0;
-    };
-
     LookupResource(ResourceType level);
 
     ~LookupResource();
diff -r d207f6ac1f86 -r 5db446c6b2dd OrthancServer/ServerContext.cpp
--- a/OrthancServer/ServerContext.cpp	Sat Dec 15 10:57:18 2018 +0100
+++ b/OrthancServer/ServerContext.cpp	Sat Dec 15 16:30:47 2018 +0100
@@ -773,7 +773,7 @@
   }
 
 
-  void ServerContext::Apply(LookupResource::IVisitor& visitor,
+  void ServerContext::Apply(ILookupVisitor& visitor,
                             const ::Orthanc::LookupResource& lookup,
                             size_t since,
                             size_t limit)
diff -r d207f6ac1f86 -r 5db446c6b2dd OrthancServer/ServerContext.h
--- a/OrthancServer/ServerContext.h	Sat Dec 15 10:57:18 2018 +0100
+++ b/OrthancServer/ServerContext.h	Sat Dec 15 16:30:47 2018 +0100
@@ -63,6 +63,25 @@
    **/
   class ServerContext : private JobsRegistry::IObserver
   {
+  public:
+    class ILookupVisitor : public boost::noncopyable
+    {
+    public:
+      virtual ~ILookupVisitor()
+      {
+      }
+
+      virtual bool IsDicomAsJsonNeeded() const = 0;
+      
+      virtual void MarkAsComplete() = 0;
+
+      virtual void Visit(const std::string& publicId,
+                         const std::string& instanceId,
+                         const DicomMap& mainDicomTags,
+                         const Json::Value* dicomAsJson) = 0;
+    };
+    
+    
   private:
     enum LookupMode
     {
@@ -343,7 +362,7 @@
 
     void Stop();
 
-    void Apply(LookupResource::IVisitor& visitor,
+    void Apply(ILookupVisitor& visitor,
                const ::Orthanc::LookupResource& lookup,
                size_t since,
                size_t limit);