comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1722:f1901004f3e4 db-changes

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 20 Oct 2015 10:41:35 +0200
parents 3b1f7e706d38
children 1ae29c5e52fb
comparison
equal deleted inserted replaced
1721:3bcb01028107 1722:f1901004f3e4
877 { 877 {
878 GetModuleInternal(call, resourceType, module); 878 GetModuleInternal(call, resourceType, module);
879 } 879 }
880 880
881 881
882 static void AccumulateLookupResults(ServerIndex::LookupResults& result, 882 namespace
883 {
884 typedef std::list< std::pair<ResourceType, std::string> > LookupResults;
885 }
886
887
888 static void AccumulateLookupResults(LookupResults& result,
883 ServerIndex& index, 889 ServerIndex& index,
884 const DicomTag& tag, 890 const DicomTag& tag,
885 const std::string& value, 891 const std::string& value,
886 ResourceType level) 892 ResourceType level)
887 { 893 {
899 static void Lookup(RestApiPostCall& call) 905 static void Lookup(RestApiPostCall& call)
900 { 906 {
901 std::string tag; 907 std::string tag;
902 call.BodyToString(tag); 908 call.BodyToString(tag);
903 909
904 ServerIndex::LookupResults resources; 910 LookupResults resources;
905 ServerIndex& index = OrthancRestApi::GetIndex(call); 911 ServerIndex& index = OrthancRestApi::GetIndex(call);
906 AccumulateLookupResults(resources, index, DICOM_TAG_PATIENT_ID, tag, ResourceType_Patient); 912 AccumulateLookupResults(resources, index, DICOM_TAG_PATIENT_ID, tag, ResourceType_Patient);
907 AccumulateLookupResults(resources, index, DICOM_TAG_STUDY_INSTANCE_UID, tag, ResourceType_Study); 913 AccumulateLookupResults(resources, index, DICOM_TAG_STUDY_INSTANCE_UID, tag, ResourceType_Study);
908 AccumulateLookupResults(resources, index, DICOM_TAG_SERIES_INSTANCE_UID, tag, ResourceType_Series); 914 AccumulateLookupResults(resources, index, DICOM_TAG_SERIES_INSTANCE_UID, tag, ResourceType_Series);
909 AccumulateLookupResults(resources, index, DICOM_TAG_SOP_INSTANCE_UID, tag, ResourceType_Instance); 915 AccumulateLookupResults(resources, index, DICOM_TAG_SOP_INSTANCE_UID, tag, ResourceType_Instance);
910 916
911 Json::Value result = Json::arrayValue; 917 Json::Value result = Json::arrayValue;
912 for (ServerIndex::LookupResults::const_iterator 918 for (LookupResults::const_iterator
913 it = resources.begin(); it != resources.end(); ++it) 919 it = resources.begin(); it != resources.end(); ++it)
914 { 920 {
915 ResourceType type = it->first; 921 ResourceType type = it->first;
916 const std::string& id = it->second; 922 const std::string& id = it->second;
917 923