# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1720522306 -7200
# Node ID 11575590e4937f1a00544498ea84124a315aa0eb
# Parent  f0f7d15d195e2111c87274d99add727ed1c2e644
integrating DatabaseLookup into ResourceFinder

diff -r f0f7d15d195e -r 11575590e493 OrthancServer/Sources/ResourceFinder.cpp
--- a/OrthancServer/Sources/ResourceFinder.cpp	Tue Jul 09 12:06:50 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.cpp	Tue Jul 09 12:51:46 2024 +0200
@@ -36,6 +36,19 @@
 
 namespace Orthanc
 {
+  static bool IsComputedTag(const DicomTag& tag)
+  {
+    return (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES ||
+            tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES ||
+            tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES ||
+            tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES ||
+            tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES ||
+            tag == DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES ||
+            tag == DICOM_TAG_SOP_CLASSES_IN_STUDY ||
+            tag == DICOM_TAG_MODALITIES_IN_STUDY ||
+            tag == DICOM_TAG_INSTANCE_AVAILABILITY);
+  }
+
   void ResourceFinder::ConfigureChildrenCountComputedTag(DicomTag tag,
                                                          ResourceType parentLevel,
                                                          ResourceType childLevel)
@@ -455,12 +468,32 @@
 
   void ResourceFinder::SetDatabaseLookup(const DatabaseLookup& lookup)
   {
+    lookup_.reset(lookup.Clone());
+
+    for (size_t i = 0; i < lookup.GetConstraintsCount(); i++)
+    {
+      DicomTag tag = lookup.GetConstraint(i).GetTag();
+      if (IsComputedTag(tag))
+      {
+        AddRequestedTag(tag);
+      }
+    }
+
     MainDicomTagsRegistry registry;
     registry.NormalizeLookup(request_.GetDicomTagConstraints(), lookup, request_.GetLevel());
+
+    // Sanity check
+    for (size_t i = 0; i < request_.GetDicomTagConstraints().GetSize(); i++)
+    {
+      if (IsComputedTag(request_.GetDicomTagConstraints().GetConstraint(i).GetTag()))
+      {
+        throw OrthancException(ErrorCode_InternalError);
+      }
+    }
   }
 
 
-  void ResourceFinder::AddRequestedTags(const DicomTag& tag)
+  void ResourceFinder::AddRequestedTag(const DicomTag& tag)
   {
     if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient))
     {
@@ -602,7 +635,7 @@
   {
     for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
     {
-      AddRequestedTags(*it);
+      AddRequestedTag(*it);
     }
   }
 
@@ -711,14 +744,7 @@
   void ResourceFinder::Execute(FindResponse& response,
                                ServerIndex& index) const
   {
-    if (hasRequestedTags_)
-    {
-      throw OrthancException(ErrorCode_BadSequenceOfCalls);
-    }
-    else
-    {
-      index.ExecuteFind(response, request_);
-    }
+    index.ExecuteFind(response, request_);
   }
 
   
@@ -734,45 +760,62 @@
     {
       const FindResponse::Resource& resource = response.GetResourceByIndex(i);
 
-      if (expand_)
+      DicomMap requestedTags;
+
+      if (hasRequestedTags_)
       {
-        Json::Value item;
-        Expand(item, resource, context.GetIndex());
+        InjectComputedTags(requestedTags, resource);
 
-        if (hasRequestedTags_)
-        {
-          DicomMap requestedTags;
-          InjectComputedTags(requestedTags, resource);
+        std::set<DicomTag> missingTags = requestedTagsFromFileStorage_;
+        InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Patient, requestedPatientTags_);
+        InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Study, requestedStudyTags_);
+        InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Series, requestedSeriesTags_);
+        InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Instance, requestedInstanceTags_);
 
-          std::set<DicomTag> missingTags = requestedTagsFromFileStorage_;
-          InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Patient, requestedPatientTags_);
-          InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Study, requestedStudyTags_);
-          InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Series, requestedSeriesTags_);
-          InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Instance, requestedInstanceTags_);
-
-          if (!missingTags.empty())
+        if (!missingTags.empty())
+        {
+          if (!allowStorageAccess_)
+          {
+            throw OrthancException(ErrorCode_BadSequenceOfCalls,
+                                   "Cannot add missing requested tags, as access to file storage is disallowed");
+          }
+          else
           {
-            if (!allowStorageAccess_)
-            {
-              throw OrthancException(ErrorCode_BadSequenceOfCalls,
-                                     "Cannot add missing requested tags, as access to file storage is disallowed");
-            }
-            else
-            {
-              ReadMissingTagsFromStorageArea(requestedTags, context, request_, resource, missingTags);
-            }
+            ReadMissingTagsFromStorageArea(requestedTags, context, request_, resource, missingTags);
+          }
+        }
+      }
+
+      bool match = true;
+
+      if (lookup_.get() != NULL)
+      {
+        DicomMap tags;
+        resource.GetMainDicomTags(tags, request_.GetLevel());
+        tags.Merge(requestedTags);
+        match = lookup_->IsMatch(tags);
+      }
+
+      if (match)
+      {
+        if (expand_)
+        {
+          Json::Value item;
+          Expand(item, resource, context.GetIndex());
+
+          if (hasRequestedTags_)
+          {
+            static const char* const REQUESTED_TAGS = "RequestedTags";
+            item[REQUESTED_TAGS] = Json::objectValue;
+            FromDcmtkBridge::ToJson(item[REQUESTED_TAGS], requestedTags, format_);
           }
 
-          static const char* const REQUESTED_TAGS = "RequestedTags";
-          item[REQUESTED_TAGS] = Json::objectValue;
-          FromDcmtkBridge::ToJson(item[REQUESTED_TAGS], requestedTags, format_);
+          target.append(item);
         }
-
-        target.append(item);
-      }
-      else
-      {
-        target.append(resource.GetIdentifier());
+        else
+        {
+          target.append(resource.GetIdentifier());
+        }
       }
     }
   }
diff -r f0f7d15d195e -r 11575590e493 OrthancServer/Sources/ResourceFinder.h
--- a/OrthancServer/Sources/ResourceFinder.h	Tue Jul 09 12:06:50 2024 +0200
+++ b/OrthancServer/Sources/ResourceFinder.h	Tue Jul 09 12:51:46 2024 +0200
@@ -35,18 +35,19 @@
   class ResourceFinder : public boost::noncopyable
   {
   private:
-    FindRequest        request_;
-    bool               expand_;
-    DicomToJsonFormat  format_;
-    bool               allowStorageAccess_;
-    bool               hasRequestedTags_;
-    std::set<DicomTag> requestedPatientTags_;
-    std::set<DicomTag> requestedStudyTags_;
-    std::set<DicomTag> requestedSeriesTags_;
-    std::set<DicomTag> requestedInstanceTags_;
-    std::set<DicomTag> requestedTagsFromFileStorage_;
-    std::set<DicomTag> requestedComputedTags_;
-    bool               includeAllMetadata_;   // Same as: ExpandResourceFlags_IncludeAllMetadata
+    FindRequest                      request_;
+    std::unique_ptr<DatabaseLookup>  lookup_;
+    bool                             expand_;
+    DicomToJsonFormat                format_;
+    bool                             allowStorageAccess_;
+    bool                             hasRequestedTags_;
+    std::set<DicomTag>               requestedPatientTags_;
+    std::set<DicomTag>               requestedStudyTags_;
+    std::set<DicomTag>               requestedSeriesTags_;
+    std::set<DicomTag>               requestedInstanceTags_;
+    std::set<DicomTag>               requestedTagsFromFileStorage_;
+    std::set<DicomTag>               requestedComputedTags_;
+    bool                             includeAllMetadata_;   // Same as: ExpandResourceFlags_IncludeAllMetadata
 
     bool IsRequestedComputedTag(const DicomTag& tag) const
     {
@@ -110,7 +111,7 @@
       includeAllMetadata_ = include;
     }
 
-    void AddRequestedTags(const DicomTag& tag);
+    void AddRequestedTag(const DicomTag& tag);
 
     void AddRequestedTags(const std::set<DicomTag>& tags);
 
diff -r f0f7d15d195e -r 11575590e493 OrthancServer/Sources/ServerContext.cpp
--- a/OrthancServer/Sources/ServerContext.cpp	Tue Jul 09 12:06:50 2024 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Tue Jul 09 12:51:46 2024 +0200
@@ -1570,7 +1570,7 @@
         finder.SetLimits(0, databaseLimit + 1);
       }
 
-      finder.SetDatabaseLookup(*fastLookup);
+      finder.SetDatabaseLookup(lookup);
       finder.SetLabels(labels);
       finder.SetLabelsConstraint(labelsConstraint);