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

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5828:7030fa489669 find-refactoring

tools/find: QueryMetadata

author	Alain Mazy <am@orthanc.team>
date	Mon, 07 Oct 2024 15:19:26 +0200
parents	d73dfb4548c6
children	963945d780d6

comparison

equal deleted inserted replaced

-:976872a99d39
+:7030fa489669
 #include "../../../OrthancFramework/Sources/MultiThreading/Semaphore.h"
 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
 #include "../OrthancConfiguration.h"
 #include "../Search/DatabaseLookup.h"
+#include "../Search/DatabaseMetadataConstraint.h"
 #include "../ServerContext.h"
 #include "../ServerToolbox.h"
 #include "../SliceOrdering.h"
 // This "include" is mandatory for Release builds using Linux Standard Base
 static const char* const KEY_ORDER_BY_TYPE = "Type";                  // New in Orthanc 1.12.5
 static const char* const KEY_ORDER_BY_DIRECTION = "Direction";        // New in Orthanc 1.12.5
 static const char* const KEY_PARENT_PATIENT = "ParentPatient";        // New in Orthanc 1.12.5
 static const char* const KEY_PARENT_STUDY = "ParentStudy";            // New in Orthanc 1.12.5
 static const char* const KEY_PARENT_SERIES = "ParentSeries";          // New in Orthanc 1.12.5
+static const char* const KEY_QUERY_METADATA = "QueryMetadata";        // New in Orthanc 1.12.5
 if (call.IsDocumentation())
 {
 OrthancRestApi::DocumentDicomFormat(call, DicomToJsonFormat_Human);
 "Limit the reported resources to descendants of this patient (new in Orthanc 1.12.5)", true)
 .SetRequestField(KEY_PARENT_STUDY, RestApiCallDocumentation::Type_String,
 "Limit the reported resources to descendants of this study (new in Orthanc 1.12.5)", true)
 .SetRequestField(KEY_PARENT_SERIES, RestApiCallDocumentation::Type_String,
 "Limit the reported resources to descendants of this series (new in Orthanc 1.12.5)", true)
+.SetRequestField(KEY_QUERY_METADATA, RestApiCallDocumentation::Type_JsonObject,
+"Associative array containing the filter on the values of the metadata (new in Orthanc 1.12.5)", true)
 .AddAnswerType(MimeType_Json, "JSON array containing either the Orthanc identifiers, or detailed information "
 "about the reported resources (if `Expand` argument is `true`)");
 return;
 }
 request[KEY_ORDER_BY].type() != Json::arrayValue)
 {
 throw OrthancException(ErrorCode_BadRequest,
 "Field \"" + std::string(KEY_ORDER_BY) + "\" must be an array");
 }
+else if (request.isMember(KEY_QUERY_METADATA) &&
+request[KEY_QUERY_METADATA].type() != Json::objectValue)
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Field \"" + std::string(KEY_QUERY_METADATA) + "\" must be an JSON object");
+}
 else if (request.isMember(KEY_PARENT_PATIENT) &&
 request[KEY_PARENT_PATIENT].type() != Json::stringValue)
 {
 throw OrthancException(ErrorCode_BadRequest,
 "Field \"" + std::string(KEY_PARENT_PATIENT) + "\" must be a string");
 if (request.isMember(KEY_CASE_SENSITIVE))
 {
 caseSensitive = request[KEY_CASE_SENSITIVE].asBool();
 }
-DatabaseLookup query;
+{ // DICOM Tag query
+DatabaseLookup dicomTagLookup;
-Json::Value::Members members = request[KEY_QUERY].getMemberNames();
-for (size_t i = 0; i < members.size(); i++)
+Json::Value::Members members = request[KEY_QUERY].getMemberNames();
-{
+for (size_t i = 0; i < members.size(); i++)
-if (request[KEY_QUERY][members[i]].type() != Json::stringValue)
 {
-throw OrthancException(ErrorCode_BadRequest,
+if (request[KEY_QUERY][members[i]].type() != Json::stringValue)
-"Tag \"" + members[i] + "\" must be associated with a string");
+{
+throw OrthancException(ErrorCode_BadRequest,
+"Tag \"" + members[i] + "\" must be associated with a string");
+}
+const std::string value = request[KEY_QUERY][members[i]].asString();
+if (!value.empty())
+{
+// An empty string corresponds to an universal constraint,
+// so we ignore it. This mimics the behavior of class
+// "OrthancFindRequestHandler"
+dicomTagLookup.AddRestConstraint(FromDcmtkBridge::ParseTag(members[i]),
+value, caseSensitive, true);
+}
 }
-const std::string value = request[KEY_QUERY][members[i]].asString();
+finder.SetDatabaseLookup(dicomTagLookup);
+}
-if (!value.empty())
+{ // Metadata query
+Json::Value::Members members = request[KEY_QUERY_METADATA].getMemberNames();
+for (size_t i = 0; i < members.size(); i++)
 {
-// An empty string corresponds to an universal constraint,
+if (request[KEY_QUERY_METADATA][members[i]].type() != Json::stringValue)
-// so we ignore it. This mimics the behavior of class
+{
-// "OrthancFindRequestHandler"
+throw OrthancException(ErrorCode_BadRequest,
-query.AddRestConstraint(FromDcmtkBridge::ParseTag(members[i]),
+"Tag \"" + members[i] + "\" must be associated with a string");
-value, caseSensitive, true);
+}
+MetadataType metadata = StringToMetadata(members[i]);
+const std::string value = request[KEY_QUERY_METADATA][members[i]].asString();
+if (!value.empty())
+{
+if (value.find('\\') != std::string::npos)
+{
+std::vector<std::string> items;
+Toolbox::TokenizeString(items, value, '\\');
+finder.AddMetadataConstraint(new DatabaseMetadataConstraint(metadata, ConstraintType_List, items, caseSensitive));
+}
+else if (value.find('*') != std::string::npos || value.find('?') != std::string::npos)
+{
+finder.AddMetadataConstraint(new DatabaseMetadataConstraint(metadata, ConstraintType_Wildcard, value, caseSensitive));
+}
+else
+{
+finder.AddMetadataConstraint(new DatabaseMetadataConstraint(metadata, ConstraintType_Equal, value, caseSensitive));
+}
+}
 }
 }
-finder.SetDatabaseLookup(query);
 }
 if (request.isMember(KEY_REQUESTED_TAGS))
 {
 std::set<DicomTag> requestedTags;

Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5828:7030fa489669 find-refactoring