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

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5554:12d8a1a266e9 find-refactoring

introduction of FindRequest and FindResponse

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 15 Apr 2024 16:13:24 +0200
parents	48b8dae6dc77
children	def06a42e5ef

comparison

equal deleted inserted replaced

-:dcbf0c776945
+:12d8a1a266e9
 }
 // List all the patients, studies, series or instances ----------------------
-static void AnswerListOfResources(RestApiOutput& output,
+static void AnswerListOfResources1(RestApiOutput& output,
 ServerContext& context,
 const std::list<std::string>& resources,
 const std::map<std::string, std::string>& instancesIds, // optional: the id of an instance for each found resource.
 const std::map<std::string, boost::shared_ptr<DicomMap> >& resourcesMainDicomTags,  // optional: all tags read from DB for a resource (current level and upper levels)
 const std::map<std::string, boost::shared_ptr<Json::Value> >& resourcesDicomAsJson, // optional: the dicom-as-json for each resource
 output.AnswerJson(answer);
 }
-static void AnswerListOfResources(RestApiOutput& output,
+static void AnswerListOfResources2(RestApiOutput& output,
 ServerContext& context,
 const std::list<std::string>& resources,
 ResourceType level,
 bool expand,
 DicomToJsonFormat format,
 {
 std::map<std::string, std::string> unusedInstancesIds;
 std::map<std::string, boost::shared_ptr<DicomMap> > unusedResourcesMainDicomTags;
 std::map<std::string, boost::shared_ptr<Json::Value> > unusedResourcesDicomAsJson;
-AnswerListOfResources(output, context, resources, unusedInstancesIds, unusedResourcesMainDicomTags, unusedResourcesDicomAsJson, level, expand, format, requestedTags, allowStorageAccess);
+AnswerListOfResources1(output, context, resources, unusedInstancesIds, unusedResourcesMainDicomTags, unusedResourcesDicomAsJson, level, expand, format, requestedTags, allowStorageAccess);
 }
 template <enum ResourceType resourceType>
 static void ListResources(RestApiGetCall& call)
 }
 ServerIndex& index = OrthancRestApi::GetIndex(call);
 ServerContext& context = OrthancRestApi::GetContext(call);
-std::list<std::string> result;
+if (true)
+{
-std::set<DicomTag> requestedTags;
+/**
-OrthancRestApi::GetRequestedTags(requestedTags, call);
+* EXPERIMENTAL VERSION
+**/
-if (call.HasArgument("limit") ||
-call.HasArgument("since"))
+const bool expand = (call.HasArgument("expand") &&
-{
+call.GetBooleanArgument("expand", true));
-if (!call.HasArgument("limit"))
-{
+FindRequest request(resourceType);
-throw OrthancException(ErrorCode_BadRequest,
-"Missing \"limit\" argument for GET request against: " +
+#if 0
-call.FlattenUri());
+// TODO - This version should be executed if no disk access is needed
-}
+if (expand)
+{
-if (!call.HasArgument("since"))
+request.SetResponseType(FindRequest::ResponseType_DicomMap);
-{
+request.SetMetadataMode(FindRequest::MetadataMode_Retrieve);
-throw OrthancException(ErrorCode_BadRequest,
+request.SetRetrieveTagsAtLevel(resourceType, true);
-"Missing \"since\" argument for GET request against: " +
-call.FlattenUri());
+if (resourceType == ResourceType_Study)
-}
+{
+request.SetRetrieveTagsAtLevel(ResourceType_Patient, true);
-size_t since = boost::lexical_cast<size_t>(call.GetArgument("since", ""));
+}
-size_t limit = boost::lexical_cast<size_t>(call.GetArgument("limit", ""));
+}
-index.GetAllUuids(result, resourceType, since, limit);
+else
+{
+request.SetResponseType(FindRequest::ResponseType_OrthancIdentifiers);
+request.SetMetadataMode(FindRequest::MetadataMode_None);
+}
+#else
+request.SetResponseType(FindRequest::ResponseType_OrthancIdentifiers);
+request.SetMetadataMode(FindRequest::MetadataMode_None);
+#endif
+if (call.HasArgument("limit") ||
+call.HasArgument("since"))
+{
+if (!call.HasArgument("limit"))
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Missing \"limit\" argument for GET request against: " +
+call.FlattenUri());
+}
+if (!call.HasArgument("since"))
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Missing \"since\" argument for GET request against: " +
+call.FlattenUri());
+}
+uint64_t since = boost::lexical_cast<uint64_t>(call.GetArgument("since", ""));
+uint64_t limit = boost::lexical_cast<uint64_t>(call.GetArgument("limit", ""));
+request.SetLimits(since, limit);
+}
+FindResponse response;
+index.ExecuteFind(response, request);
+std::set<DicomTag> requestedTags;
+OrthancRestApi::GetRequestedTags(requestedTags, call);
+const DicomToJsonFormat format = OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human);
+Json::Value answer = Json::arrayValue;
+for (size_t i = 0; i < response.GetSize(); i++)
+{
+std::string resourceId = response.GetItem(i).GetIdentifiers().GetLevel(resourceType);
+if (expand)
+{
+Json::Value expanded;
+context.ExpandResource(expanded, resourceId, resourceType, format, requestedTags, true /* allowStorageAccess */);
+if (expanded.type() == Json::objectValue)
+{
+answer.append(expanded);
+}
+else
+{
+throw OrthancException(ErrorCode_InternalError);
+}
+}
+else
+{
+answer.append(resourceId);
+}
+}
+call.GetOutput().AnswerJson(answer);
 }
 else
 {
-index.GetAllUuids(result, resourceType);
+/**
-}
+* VERSION IN ORTHANC <= 1.12.3
+**/
-AnswerListOfResources(call.GetOutput(), context, result, resourceType, call.HasArgument("expand") && call.GetBooleanArgument("expand", true),
-OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human),
+std::list<std::string> result;
-requestedTags,
-true /* allowStorageAccess */);
+std::set<DicomTag> requestedTags;
+OrthancRestApi::GetRequestedTags(requestedTags, call);
+if (call.HasArgument("limit") ||
+call.HasArgument("since"))
+{
+if (!call.HasArgument("limit"))
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Missing \"limit\" argument for GET request against: " +
+call.FlattenUri());
+}
+if (!call.HasArgument("since"))
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Missing \"since\" argument for GET request against: " +
+call.FlattenUri());
+}
+size_t since = boost::lexical_cast<size_t>(call.GetArgument("since", ""));
+size_t limit = boost::lexical_cast<size_t>(call.GetArgument("limit", ""));
+index.GetAllUuids(result, resourceType, since, limit);
+}
+else
+{
+index.GetAllUuids(result, resourceType);
+}
+AnswerListOfResources2(call.GetOutput(), context, result, resourceType, call.HasArgument("expand") && call.GetBooleanArgument("expand", true),
+OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human),
+requestedTags,
+true /* allowStorageAccess */);
+}
 }
 template <enum ResourceType resourceType>
 ServerContext& context,
 ResourceType level,
 bool expand,
 const std::set<DicomTag>& requestedTags) const
 {
-AnswerListOfResources(output, context, resources_, instancesIds_, resourcesMainDicomTags_, resourcesDicomAsJson_, level, expand, format_, requestedTags, IsStorageAccessAllowedForAnswers(findStorageAccessMode_));
+AnswerListOfResources1(output, context, resources_, instancesIds_, resourcesMainDicomTags_, resourcesDicomAsJson_, level, expand, format_, requestedTags, IsStorageAccessAllowedForAnswers(findStorageAccessMode_));
 }
 };
 }
 a.clear();
 a.splice(a.begin(), b);
 }
-AnswerListOfResources(call.GetOutput(), context, a, type, !call.HasArgument("expand") || call.GetBooleanArgument("expand", false),  // this "expand" is the only one to have a false default value to keep backward compatibility
+AnswerListOfResources2(call.GetOutput(), context, a, type, !call.HasArgument("expand") || call.GetBooleanArgument("expand", false),  // this "expand" is the only one to have a false default value to keep backward compatibility
 OrthancRestApi::GetDicomFormat(call, DicomToJsonFormat_Human),
 requestedTags,
 true /* allowStorageAccess */);
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5554:12d8a1a266e9 find-refactoring