# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1445964305 -3600
# Node ID c3d8ec63a179e8294c2e941cac4bf31856df1660
# Parent  fb569ee09a69dc65ce4046a33a5c4bc1b2532ab6
cont

diff -r fb569ee09a69 -r c3d8ec63a179 OrthancServer/OrthancFindRequestHandler.cpp
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Tue Oct 27 16:05:42 2015 +0100
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Tue Oct 27 17:45:05 2015 +0100
@@ -307,10 +307,17 @@
       }
 
 #if USE_LOOKUP_RESOURCE == 1
-      // TODO SetModalitiesInStudy(value);
-
-      finder.Add(tag, value, caseSensitivePN);
-
+      if (tag == DICOM_TAG_MODALITIES_IN_STUDY)
+      {
+        // TODO SetModalitiesInStudy(value);
+        // findQuery.SetModalitiesInStudy(value);
+        printf("ICI\n");
+        throw OrthancException(ErrorCode_NotImplemented);
+      }
+      else
+      {
+        finder.Add(tag, value, caseSensitivePN);
+      }
 #else
 
       if (tag == DICOM_TAG_MODALITIES_IN_STUDY)
@@ -353,6 +360,16 @@
 
 #if USE_LOOKUP_RESOURCE == 1
     bool finished = context_.Apply(tmp, finder);
+
+    for (std::list<std::string>::const_iterator
+        it = tmp.begin(); it != tmp.end(); ++it)
+    {
+      // TODO
+      Json::Value resource;
+      context_.ReadJson(resource, *it);
+      AddAnswer(answers, resource, query);
+    }
+
 #else
     bool finished = finder.Apply(tmp, findQuery);
 #endif