orthanc: OrthancServer/OrthancFindRequestHandler.cpp comparison

comparison OrthancServer/OrthancFindRequestHandler.cpp @ 611:9924aec1d694 find-move-scp

filtering on modalities

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 18 Oct 2013 13:12:18 +0200
parents	5ba825b87b21
children	fdd5f7f9c4d7

comparison

equal deleted inserted replaced

-:5ba825b87b21
+:9924aec1d694
 static bool ApplyListConstraint(const std::string& value,
 const std::string& constraint)
 {
-std::cout << value << std::endl;
 std::string v1 = ToLowerCase(value);
 std::vector<std::string> items;
 Toolbox::TokenizeString(items, constraint, '\\');
 {
 for (size_t i = 0; i < query.GetSize(); i++)
 {
 if (query.GetElement(i).GetValue().IsNull() ||
 query.GetElement(i).GetTag() == DICOM_TAG_QUERY_RETRIEVE_LEVEL ||
-query.GetElement(i).GetTag() == DICOM_TAG_SPECIFIC_CHARACTER_SET)
+query.GetElement(i).GetTag() == DICOM_TAG_SPECIFIC_CHARACTER_SET ||
+query.GetElement(i).GetTag() == DICOM_TAG_MODALITIES_IN_STUDY)
 {
 continue;
 }
 std::string tag = query.GetElement(i).GetTag().Format();
 std::string value;
 if (resource.isMember(tag))
 {
 value = resource.get(tag, Json::arrayValue).get("Value", "").asString();
 }
-std::cout << tag << " " << value << std::endl;
 if (!Matches(value, query.GetElement(i).GetValue().AsString()))
 {
 return false;
 }
 Json::Value resources;
 context_.GetIndex().GetAllUuids(resources, level);
 assert(resources.type() == Json::arrayValue);
 // TODO : Speed up using MainDicomTags (to avoid looping over ALL
 // the resources and reading the JSON file for each of them)
+/**
+* Apply filtering on modalities for studies, if asked (this is an
+* extension to standard DICOM)
+* http://www.medicalconnections.co.uk/kb/Filtering_on_and_Retrieving_the_Modality_in_a_C_FIND
+**/
+if (level == ResourceType_Study &&
+input.HasTag(DICOM_TAG_MODALITIES_IN_STUDY))
+{
+const DicomValue& v = input.GetValue(DICOM_TAG_MODALITIES_IN_STUDY);
+if (!v.IsNull())
+{
+// Move the allowed modalities into a "std::set"
+std::vector<std::string>  tmp;
+Toolbox::TokenizeString(tmp, v.AsString(), '\\');
+std::set<std::string> modalities;
+for (size_t i = 0; i < tmp.size(); i++)
+{
+modalities.insert(tmp[i]);
+}
+// Loop over the studies
+Json::Value studies = resources;
+resources = Json::arrayValue;
+for (Json::Value::ArrayIndex i = 0; i < studies.size(); i++)
+{
+// We are considering a single study. Check whether one of
+// its child series matches one of the modalities.
+Json::Value study;
+if (context_.GetIndex().LookupResource(study, studies[i].asString(), ResourceType_Study))
+{
+// Loop over the series of the considered study.
+for (Json::Value::ArrayIndex j = 0; j < study["Series"].size(); j++)   // (*)
+{
+Json::Value series;
+if (context_.GetIndex().LookupResource(series, study["Series"][j].asString(), ResourceType_Series))
+{
+// Get the modality of this series
+if (series["MainDicomTags"].isMember("Modality"))
+{
+std::string modality = series["MainDicomTags"]["Modality"].asString();
+if (modalities.find(modality) != modalities.end())
+{
+// This series of the considered study matches one
+// of the required modalities. Take the study into
+// consideration for future filtering.
+resources.append(studies[i]);
+// We have finished considering this study. Break the study loop at (*).
+break;
+}
+}
+}
+}
+}
+}
+}
+}
 /**
 * Loop over all the resources for this query level.
 **/
 }
 }
 }
 catch (OrthancException&)
 {
-// This resource has been deleted during the find request
+// This resource has probably been deleted during the find request
 }
 }
 }
 }

Mercurial > hg > orthanc

comparison OrthancServer/OrthancFindRequestHandler.cpp @ 611:9924aec1d694 find-move-scp