diff OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1358:62d2d35b725e

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 May 2015 17:56:27 +0200
parents ab9f3d5910bd
children 0649c5aef34a
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Wed May 13 15:56:41 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Wed May 13 17:56:27 2015 +0200
@@ -35,7 +35,7 @@
 
 #include "../ServerToolbox.h"
 #include "../FromDcmtkBridge.h"
-#include "../ExactResourceFinder.h"
+#include "../ResourceFinder.h"
 
 #include <glog/logging.h>
 
@@ -850,7 +850,7 @@
 
   static void Find(RestApiPostCall& call)
   {
-    ServerIndex& index = OrthancRestApi::GetIndex(call);
+    ServerContext& context = OrthancRestApi::GetContext(call);
 
     Json::Value request;
     if (call.ParseJsonRequest(request) &&
@@ -862,20 +862,20 @@
     {
       std::string level = request["Level"].asString();
 
-      ExactResourceFinder finder(index);
+      ResourceFinder finder(context);
       finder.SetLevel(StringToResourceType(level.c_str()));
 
-      if (request.isMember("CaseSensitive"))
-      {
-        finder.SetCaseSensitive(request["CaseSensitive"].asBool());
-      }
-
       bool expand = false;
       if (request.isMember("Expand"))
       {
         expand = request["Expand"].asBool();
       }
 
+      /*if (request.isMember("CaseSensitive"))
+      {
+        finder.SetCaseSensitive(request["CaseSensitive"].asBool());
+      }
+
       Json::Value::Members members = request["Query"].getMemberNames();
       for (size_t i = 0; i < members.size(); i++)
       {
@@ -885,11 +885,11 @@
         }
 
         finder.AddTag(members[i], request["Query"][members[i]].asString());
-      }
+        }*/
 
       std::list<std::string> resources;
       finder.Apply(resources);
-      AnswerListOfResources(call.GetOutput(), index, resources, finder.GetLevel(), expand);
+      AnswerListOfResources(call.GetOutput(), context.GetIndex(), resources, finder.GetLevel(), expand);
     }
     else
     {