orthanc: OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp comparison

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 4699:facea16b055b

added the "Level" argument to "/tools/bulk-content"

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 18 Jun 2021 17:58:56 +0200
parents	d16c3c7f11ef
children	f0038043fb97 8ffe2fdb541f

comparison

equal deleted inserted replaced

-:d16c3c7f11ef
+:facea16b055b
 call.GetOutput().AnswerBuffer("", MimeType_PlainText);
 }
+static void GetBulkChildren(std::set<std::string>& target,
+ServerIndex& index,
+const std::set<std::string>& source)
+{
+target.clear();
+for (std::set<std::string>::const_iterator
+it = source.begin(); it != source.end(); ++it)
+{
+std::list<std::string> children;
+index.GetChildren(children, *it);
+for (std::list<std::string>::const_iterator
+child = children.begin(); child != children.end(); ++child)
+{
+target.insert(*child);
+}
+}
+}
 static void BulkContent(RestApiPostCall& call)
 {
 if (call.IsDocumentation())
 {
 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
 call.GetDocumentation()
 .SetTag("System")
 .SetSummary("Describe a set of instances")
 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
-"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", false)
+"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
+.SetRequestField("Level", RestApiCallDocumentation::Type_String,
+"This optional argument specifies the level of interest (can be `Patient`, `Study`, `Series` or "
+"`Instance`). Orthanc will loop over the items inside `Resources`, and explorer upward or "
+"downward in the DICOM hierarchy in order to find the level of interest.", false)
 .SetDescription("Get the content all the DICOM patients, studies, series or instances "
 "whose identifiers are provided in the `Resources` field, in one single call.");
 return;
 }
 throw OrthancException(ErrorCode_BadRequest,
 "The body must contain a JSON object");
 }
 else
 {
+static const char* const LEVEL = "Level";
 const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(request, DicomToJsonFormat_Human);
 ServerIndex& index = OrthancRestApi::GetIndex(call);
-std::list<std::string> resources;
-SerializationToolbox::ReadListOfStrings(resources, request, "Resources");
 Json::Value answer = Json::arrayValue;
-for (std::list<std::string>::const_iterator
-it = resources.begin(); it != resources.end(); ++it)
+if (request.isMember(LEVEL))
 {
-ResourceType type;
+// Complex case: Need to explore the DICOM hierarchy
-Json::Value item;
+ResourceType level = StringToResourceType(SerializationToolbox::ReadString(request, LEVEL).c_str());
-if (index.LookupResourceType(type, *it) &&
-index.ExpandResource(item, *it, type, format))
+std::set<std::string> resources;
-{
+SerializationToolbox::ReadSetOfStrings(resources, request, "Resources");
-answer.append(item);
-}
+std::set<std::string> interest;
-else
-{
+assert(ResourceType_Patient < ResourceType_Study &&
-CLOG(INFO, HTTP) << "Unknown resource during a bulk content retrieval: " << *it;
+ResourceType_Study < ResourceType_Series &&
+ResourceType_Series < ResourceType_Instance);
+for (std::set<std::string>::const_iterator
+it = resources.begin(); it != resources.end(); ++it)
+{
+ResourceType type;
+if (index.LookupResourceType(type, *it))
+{
+if (type == level)
+{
+// This resource is already from the level of interest
+interest.insert(*it);
+}
+else if (type < level)
+{
+// Need to explore children
+std::set<std::string> current;
+current.insert(*it);
+for (;;)
+{
+std::set<std::string> children;
+GetBulkChildren(children, index, current);
+type = GetChildResourceType(type);
+if (type == level)
+{
+for (std::set<std::string>::const_iterator
+it = children.begin(); it != children.end(); ++it)
+{
+interest.insert(*it);
+}
+break;  // done
+}
+else
+{
+current.swap(children);
+}
+}
+}
+else
+{
+// Need to explore parents
+std::string current = *it;
+for (;;)
+{
+std::string parent;
+if (index.LookupParent(parent, current))
+{
+type = GetParentResourceType(type);
+if (type == level)
+{
+interest.insert(parent);
+break;  // done
+}
+else
+{
+current = parent;
+}
+}
+else
+{
+break;  // The resource has been deleted during the exploration
+}
+}
+}
+}
+else
+{
+CLOG(INFO, HTTP) << "Unknown resource during a bulk content retrieval: " << *it;
+}
+}
+for (std::set<std::string>::const_iterator
+it = interest.begin(); it != interest.end(); ++it)
+{
+Json::Value item;
+if (index.ExpandResource(item, *it, level, format))
+{
+answer.append(item);
+}
+}
+}
+else
+{
+// Simple case: We return the queried resources as such
+std::list<std::string> resources;
+SerializationToolbox::ReadListOfStrings(resources, request, "Resources");
+for (std::list<std::string>::const_iterator
+it = resources.begin(); it != resources.end(); ++it)
+{
+ResourceType type;
+Json::Value item;
+if (index.LookupResourceType(type, *it) &&
+index.ExpandResource(item, *it, type, format))
+{
+answer.append(item);
+}
+else
+{
+CLOG(INFO, HTTP) << "Unknown resource during a bulk content retrieval: " << *it;
+}
 }
 }
 call.GetOutput().AnswerJson(answer);
 }
 {
 call.GetDocumentation()
 .SetTag("System")
 .SetSummary("Delete a set of instances")
 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
-"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", false)
+"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", true)
 .SetDescription("Delete all the DICOM patients, studies, series or instances "
 "whose identifiers are provided in the `Resources` field.");
 return;
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 4699:facea16b055b