orthanc: OrthancServer/OrthancRestApi/OrthancRestResources.cpp comparison

comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1023:226cfef3822e templating

integration mainline->templating

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 10 Jul 2014 11:42:32 +0200
parents	83622b0f544c
children	1701dcb6f554

comparison

equal deleted inserted replaced

-:427a1f996b7b
+:226cfef3822e
 namespace Orthanc
 {
 // List all the patients, studies, series or instances ----------------------
 template <enum ResourceType resourceType>
-static void ListResources(RestApi::GetCall& call)
+static void ListResources(RestApiGetCall& call)
 {
 Json::Value result;
 OrthancRestApi::GetIndex(call).GetAllUuids(result, resourceType);
 call.GetOutput().AnswerJson(result);
 }
 template <enum ResourceType resourceType>
-static void GetSingleResource(RestApi::GetCall& call)
+static void GetSingleResource(RestApiGetCall& call)
 {
 Json::Value result;
 if (OrthancRestApi::GetIndex(call).LookupResource(result, call.GetUriComponent("id", ""), resourceType))
 {
 call.GetOutput().AnswerJson(result);
 }
 }
 template <enum ResourceType resourceType>
-static void DeleteSingleResource(RestApi::DeleteCall& call)
+static void DeleteSingleResource(RestApiDeleteCall& call)
 {
 Json::Value result;
 if (OrthancRestApi::GetIndex(call).DeleteResource(result, call.GetUriComponent("id", ""), resourceType))
 {
 call.GetOutput().AnswerJson(result);
 }
 // Get information about a single patient -----------------------------------
-static void IsProtectedPatient(RestApi::GetCall& call)
+static void IsProtectedPatient(RestApiGetCall& call)
 {
 std::string publicId = call.GetUriComponent("id", "");
 bool isProtected = OrthancRestApi::GetIndex(call).IsProtectedPatient(publicId);
 call.GetOutput().AnswerBuffer(isProtected ? "1" : "0", "text/plain");
 }
-static void SetPatientProtection(RestApi::PutCall& call)
+static void SetPatientProtection(RestApiPutCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string s = Toolbox::StripSpaces(call.GetPutBody());
 }
 // Get information about a single instance ----------------------------------
-static void GetInstanceFile(RestApi::GetCall& call)
+static void GetInstanceFile(RestApiGetCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string publicId = call.GetUriComponent("id", "");
 context.AnswerDicomFile(call.GetOutput(), publicId, FileContentType_Dicom);
 }
-static void ExportInstanceFile(RestApi::PostCall& call)
+static void ExportInstanceFile(RestApiPostCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string publicId = call.GetUriComponent("id", "");
 call.GetOutput().AnswerBuffer("{}", "application/json");
 }
 template <bool simplify>
-static void GetInstanceTags(RestApi::GetCall& call)
+static void GetInstanceTags(RestApiGetCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string publicId = call.GetUriComponent("id", "");
 {
 call.GetOutput().AnswerJson(full);
 }
 }
+static void GetInstanceTagsBis(RestApiGetCall& call)
+{
+bool simplify = call.HasArgument("simplify");
+if (simplify)
+{
+GetInstanceTags<true>(call);
+}
+else
+{
+GetInstanceTags<false>(call);
+}
+}
-static void ListFrames(RestApi::GetCall& call)
+static void ListFrames(RestApiGetCall& call)
 {
 Json::Value instance;
 if (OrthancRestApi::GetIndex(call).LookupResource(instance, call.GetUriComponent("id", ""), ResourceType_Instance))
 {
 unsigned int numberOfFrames = 1;
 }
 }
 template <enum ImageExtractionMode mode>
-static void GetImage(RestApi::GetCall& call)
+static void GetImage(RestApiGetCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string frameId = call.GetUriComponent("frame", "0");
 }
 }
 }
-static void GetMatlabImage(RestApi::GetCall& call)
+static void GetMatlabImage(RestApiGetCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string frameId = call.GetUriComponent("frame", "0");
 call.GetOutput().AnswerBuffer(result, "text/plain");
 }
-static void GetResourceStatistics(RestApi::GetCall& call)
+static void GetResourceStatistics(RestApiGetCall& call)
 {
 std::string publicId = call.GetUriComponent("id", "");
 Json::Value result;
 OrthancRestApi::GetIndex(call).GetStatistics(result, publicId);
 call.GetOutput().AnswerJson(result);
 // Handling of metadata -----------------------------------------------------
-static void CheckValidResourceType(RestApi::Call& call)
+static void CheckValidResourceType(RestApiCall& call)
 {
 std::string resourceType = call.GetUriComponent("resourceType", "");
 StringToResourceType(resourceType.c_str());
 }
-static void ListMetadata(RestApi::GetCall& call)
+static void ListMetadata(RestApiGetCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::list<MetadataType> metadata;
 call.GetOutput().AnswerJson(result);
 }
-static void GetMetadata(RestApi::GetCall& call)
+static void GetMetadata(RestApiGetCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string name = call.GetUriComponent("name", "");
 call.GetOutput().AnswerBuffer(value, "text/plain");
 }
 }
-static void DeleteMetadata(RestApi::DeleteCall& call)
+static void DeleteMetadata(RestApiDeleteCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string name = call.GetUriComponent("name", "");
 call.GetOutput().AnswerBuffer("", "text/plain");
 }
 }
-static void SetMetadata(RestApi::PutCall& call)
+static void SetMetadata(RestApiPutCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string name = call.GetUriComponent("name", "");
 // Handling of attached files -----------------------------------------------
-static void ListAttachments(RestApi::GetCall& call)
+static void ListAttachments(RestApiGetCall& call)
 {
 std::string resourceType = call.GetUriComponent("resourceType", "");
 std::string publicId = call.GetUriComponent("id", "");
 std::list<FileContentType> attachments;
 OrthancRestApi::GetIndex(call).ListAvailableAttachments(attachments, publicId, StringToResourceType(resourceType.c_str()));
 call.GetOutput().AnswerJson(result);
 }
-static bool GetAttachmentInfo(FileInfo& info, RestApi::Call& call)
+static bool GetAttachmentInfo(FileInfo& info, RestApiCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string name = call.GetUriComponent("name", "");
 return OrthancRestApi::GetIndex(call).LookupAttachment(info, publicId, contentType);
 }
-static void GetAttachmentOperations(RestApi::GetCall& call)
+static void GetAttachmentOperations(RestApiGetCall& call)
 {
 FileInfo info;
 if (GetAttachmentInfo(info, call))
 {
 Json::Value operations = Json::arrayValue;
 }
 }
 template <int uncompress>
-static void GetAttachmentData(RestApi::GetCall& call)
+static void GetAttachmentData(RestApiGetCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 CheckValidResourceType(call);
 call.GetOutput().AnswerBuffer(content, "application/octet-stream");
 }
-static void GetAttachmentSize(RestApi::GetCall& call)
+static void GetAttachmentSize(RestApiGetCall& call)
 {
 FileInfo info;
 if (GetAttachmentInfo(info, call))
 {
 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedSize()), "text/plain");
 }
 }
-static void GetAttachmentCompressedSize(RestApi::GetCall& call)
+static void GetAttachmentCompressedSize(RestApiGetCall& call)
 {
 FileInfo info;
 if (GetAttachmentInfo(info, call))
 {
 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedSize()), "text/plain");
 }
 }
-static void GetAttachmentMD5(RestApi::GetCall& call)
+static void GetAttachmentMD5(RestApiGetCall& call)
 {
 FileInfo info;
 if (GetAttachmentInfo(info, call) &&
 info.GetUncompressedMD5() != "")
 {
 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetUncompressedMD5()), "text/plain");
 }
 }
-static void GetAttachmentCompressedMD5(RestApi::GetCall& call)
+static void GetAttachmentCompressedMD5(RestApiGetCall& call)
 {
 FileInfo info;
 if (GetAttachmentInfo(info, call) &&
 info.GetCompressedMD5() != "")
 {
 call.GetOutput().AnswerBuffer(boost::lexical_cast<std::string>(info.GetCompressedMD5()), "text/plain");
 }
 }
-static void VerifyAttachment(RestApi::PostCall& call)
+static void VerifyAttachment(RestApiPostCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 LOG(INFO) << "The attachment " << name << " of resource " << publicId << " has bad MD5!";
 }
 }
-static void UploadAttachment(RestApi::PutCall& call)
+static void UploadAttachment(RestApiPutCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 call.GetOutput().AnswerBuffer("{}", "application/json");
 }
 }
-static void DeleteAttachment(RestApi::DeleteCall& call)
+static void DeleteAttachment(RestApiDeleteCall& call)
 {
 CheckValidResourceType(call);
 std::string publicId = call.GetUriComponent("id", "");
 std::string name = call.GetUriComponent("name", "");
 }
 // Raw access to the DICOM tags of an instance ------------------------------
-static void GetRawContent(RestApi::GetCall& call)
+static void GetRawContent(RestApiGetCall& call)
 {
 std::string id = call.GetUriComponent("id", "");
 ServerContext::DicomCacheLocker locker(OrthancRestApi::GetContext(call), id);
 locker.GetDicom().SendPathValue(call.GetOutput(), call.GetTrailingUri());
 }
+static bool ExtractSharedTags(Json::Value& shared,
+ServerContext& context,
+const std::string& publicId)
+{
+// Retrieve all the instances of this patient/study/series
+typedef std::list<std::string> Instances;
+Instances instances;
+context.GetIndex().GetChildInstances(instances, publicId);  // (*)
+// Loop over the instances
+bool isFirst = true;
+shared = Json::objectValue;
+for (Instances::const_iterator it = instances.begin();
+it != instances.end(); it++)
+{
+// Get the tags of the current instance, in the simplified format
+Json::Value tags;
+try
+{
+context.ReadJson(tags, *it);
+}
+catch (OrthancException&)
+{
+// Race condition: This instance has been removed since
+// (*). Ignore this instance.
+continue;
+}
+if (tags.type() != Json::objectValue)
+{
+return false;   // Error
+}
+// Only keep the tags that are mapped to a string
+Json::Value::Members members = tags.getMemberNames();
+for (size_t i = 0; i < members.size(); i++)
+{
+const Json::Value& tag = tags[members[i]];
+if (tag.type() != Json::objectValue ||
+tag["Type"].type() != Json::stringValue ||
+tag["Type"].asString() != "String")
+{
+tags.removeMember(members[i]);
+}
+}
+if (isFirst)
+{
+// This is the first instance, keep its tags as such
+shared = tags;
+isFirst = false;
+}
+else
+{
+// Loop over all the members of the shared tags extracted so
+// far. If the value of one of these tags does not match its
+// value in the current instance, remove it.
+members = shared.getMemberNames();
+for (size_t i = 0; i < members.size(); i++)
+{
+if (!tags.isMember(members[i]) ||
+tags[members[i]]["Value"].asString() != shared[members[i]]["Value"].asString())
+{
+shared.removeMember(members[i]);
+}
+}
+}
+}
+return true;
+}
+static void GetSharedTags(RestApiGetCall& call)
+{
+ServerContext& context = OrthancRestApi::GetContext(call);
+std::string publicId = call.GetUriComponent("id", "");
+bool simplify = call.HasArgument("simplify");
+Json::Value sharedTags;
+if (ExtractSharedTags(sharedTags, context, publicId))
+{
+// Success: Send the value of the shared tags
+if (simplify)
+{
+Json::Value simplified;
+SimplifyTags(simplified, sharedTags);
+call.GetOutput().AnswerJson(simplified);
+}
+else
+{
+call.GetOutput().AnswerJson(sharedTags);
+}
+}
+}
+template <enum ResourceType resourceType>
+static void GetModule(RestApiGetCall& call)
+{
+ServerContext& context = OrthancRestApi::GetContext(call);
+std::string publicId = call.GetUriComponent("id", "");
+bool simplify = call.HasArgument("simplify");
+typedef std::set<DicomTag> Module;
+Module module;
+DicomTag::GetTagsForModule(module, resourceType);
+Json::Value tags;
+if (resourceType != ResourceType_Instance)
+{
+// Retrieve all the instances of this patient/study/series
+typedef std::list<std::string> Instances;
+Instances instances;
+context.GetIndex().GetChildInstances(instances, publicId);
+if (instances.empty())
+{
+return;   // Error: No instance (should never happen)
+}
+// Select one child instance
+publicId = instances.front();
+}
+context.ReadJson(tags, publicId);
+// Filter the tags of the instance according to the module
+Json::Value result = Json::objectValue;
+for (Module::const_iterator it = module.begin(); it != module.end(); it++)
+{
+std::string s = it->Format();
+if (tags.isMember(s))
+{
+result[s] = tags[s];
+}
+}
+if (simplify)
+{
+Json::Value simplified;
+SimplifyTags(simplified, result);
+call.GetOutput().AnswerJson(simplified);
+}
+else
+{
+call.GetOutput().AnswerJson(result);
+}
+}
 void OrthancRestApi::RegisterResources()
 {
 Register("/instances", ListResources<ResourceType_Instance>);
 Register("/instances/{id}/statistics", GetResourceStatistics);
 Register("/patients/{id}/statistics", GetResourceStatistics);
 Register("/studies/{id}/statistics", GetResourceStatistics);
 Register("/series/{id}/statistics", GetResourceStatistics);
+Register("/patients/{id}/shared-tags", GetSharedTags);
+Register("/series/{id}/shared-tags", GetSharedTags);
+Register("/studies/{id}/shared-tags", GetSharedTags);
+Register("/instances/{id}/module", GetModule<ResourceType_Instance>);
+Register("/patients/{id}/module", GetModule<ResourceType_Patient>);
+Register("/series/{id}/module", GetModule<ResourceType_Series>);
+Register("/studies/{id}/module", GetModule<ResourceType_Study>);
 Register("/instances/{id}/file", GetInstanceFile);
 Register("/instances/{id}/export", ExportInstanceFile);
-Register("/instances/{id}/tags", GetInstanceTags<false>);
+Register("/instances/{id}/tags", GetInstanceTagsBis);
 Register("/instances/{id}/simplified-tags", GetInstanceTags<true>);
 Register("/instances/{id}/frames", ListFrames);
 Register("/instances/{id}/frames/{frame}/preview", GetImage<ImageExtractionMode_Preview>);
 Register("/instances/{id}/frames/{frame}/image-uint8", GetImage<ImageExtractionMode_UInt8>);

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 1023:226cfef3822e templating