comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1360:0649c5aef34a

DicomFindQuery
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 15 May 2015 15:34:32 +0200
parents 62d2d35b725e
children 94ffb597d297
comparison
equal deleted inserted replaced
1359:4378a6636187 1360:0649c5aef34a
858 request.isMember("Level") && 858 request.isMember("Level") &&
859 request.isMember("Query") && 859 request.isMember("Query") &&
860 request["Level"].type() == Json::stringValue && 860 request["Level"].type() == Json::stringValue &&
861 request["Query"].type() == Json::objectValue) 861 request["Query"].type() == Json::objectValue)
862 { 862 {
863 std::string level = request["Level"].asString();
864
865 ResourceFinder finder(context);
866 finder.SetLevel(StringToResourceType(level.c_str()));
867
868 bool expand = false; 863 bool expand = false;
869 if (request.isMember("Expand")) 864 if (request.isMember("Expand"))
870 { 865 {
871 expand = request["Expand"].asBool(); 866 expand = request["Expand"].asBool();
872 } 867 }
873 868
874 /*if (request.isMember("CaseSensitive")) 869 std::string level = request["Level"].asString();
870
871 /*ResourceFinder finder(context);
872 finder.SetLevel(StringToResourceType(level.c_str()));
873
874 if (request.isMember("CaseSensitive"))
875 { 875 {
876 finder.SetCaseSensitive(request["CaseSensitive"].asBool()); 876 finder.SetCaseSensitive(request["CaseSensitive"].asBool());
877 } 877 }
878 878
879 Json::Value::Members members = request["Query"].getMemberNames(); 879 Json::Value::Members members = request["Query"].getMemberNames();
883 { 883 {
884 throw OrthancException(ErrorCode_BadRequest); 884 throw OrthancException(ErrorCode_BadRequest);
885 } 885 }
886 886
887 finder.AddTag(members[i], request["Query"][members[i]].asString()); 887 finder.AddTag(members[i], request["Query"][members[i]].asString());
888 }*/ 888 }
889 889
890 std::list<std::string> resources; 890 std::list<std::string> resources;
891 finder.Apply(resources); 891 finder.Apply(resources);
892 AnswerListOfResources(call.GetOutput(), context.GetIndex(), resources, finder.GetLevel(), expand); 892 AnswerListOfResources(call.GetOutput(), context.GetIndex(), resources, finder.GetLevel(), expand);*/
893 } 893 }
894 else 894 else
895 { 895 {
896 throw OrthancException(ErrorCode_BadRequest); 896 throw OrthancException(ErrorCode_BadRequest);
897 } 897 }