orthanc: OrthancFramework/Sources/DicomParsing/DicomModification.cpp comparison

comparison OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4687:fcd2dc7c8f31

"Replace", "Keep" and "Remove" in "/modify" and "/anonymize" accept paths to subsequences

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 09 Jun 2021 17:24:44 +0200
parents	693f049729ba
children	177ad026d219

comparison

equal deleted inserted replaced

-:693f049729ba
+:fcd2dc7c8f31
 throw OrthancException(ErrorCode_BadRequest);
 }
 std::string name = query[i].asString();
-DicomTag tag = FromDcmtkBridge::ParseTag(name);
+const DicomPath path(DicomPath::Parse(name));
-if (!force && IsDatabaseKey(tag))
+if (path.GetPrefixLength() == 0 &&
+!force &&
+IsDatabaseKey(path.GetFinalTag()))
 {
 throw OrthancException(ErrorCode_BadRequest,
 "Marking tag \"" + name + "\" as to be " +
 (operation == DicomModification::TagOperation_Keep ? "kept" : "removed") +
 " requires the \"Force\" option to be set to true");
 }
 switch (operation)
 {
 case DicomModification::TagOperation_Keep:
-target.Keep(tag);
+target.Keep(path);
-LOG(TRACE) << "Keep: " << name << " (" << tag.Format() << ")";
+LOG(TRACE) << "Keep: " << name << " = " << path.Format();
 break;
 case DicomModification::TagOperation_Remove:
-target.Remove(tag);
+target.Remove(path);
-LOG(TRACE) << "Remove: " << name << " (" << tag.Format() << ")";
+LOG(TRACE) << "Remove: " << name << " = " << path.Format();
 break;
 default:
 throw OrthancException(ErrorCode_InternalError);
 }
 for (size_t i = 0; i < members.size(); i++)
 {
 const std::string& name = members[i];
 const Json::Value& value = replacements[name];
-DicomTag tag = FromDcmtkBridge::ParseTag(name);
+const DicomPath path(DicomPath::Parse(name));
-if (!force && IsDatabaseKey(tag))
+if (path.GetPrefixLength() == 0 &&
+!force &&
+IsDatabaseKey(path.GetFinalTag()))
 {
 throw OrthancException(ErrorCode_BadRequest,
 "Marking tag \"" + name + "\" as to be replaced " +
 "requires the \"Force\" option to be set to true");
 }
-target.Replace(tag, value, false /* not safe for anonymization */);
+target.Replace(path, value, false /* not safe for anonymization */);
-LOG(TRACE) << "Replace: " << name << " (" << tag.Format()
+LOG(TRACE) << "Replace: " << name << " = " << path.Format()
-<< ") == " << value.toStyledString();
+<< " by: " << value.toStyledString();
 }
 }
 static bool GetBooleanValue(const std::string& member,
 static const char* REPLACEMENTS = "Replacements";
 static const char* MAP_PATIENTS = "MapPatients";
 static const char* MAP_STUDIES = "MapStudies";
 static const char* MAP_SERIES = "MapSeries";
 static const char* MAP_INSTANCES = "MapInstances";
-static const char* PRIVATE_CREATOR = "PrivateCreator";  // New in Orthanc 1.6.0
+static const char* PRIVATE_CREATOR = "PrivateCreator";    // New in Orthanc 1.6.0
-static const char* UIDS = "Uids";                       // New in Orthanc 1.9.4
+static const char* UIDS = "Uids";                         // New in Orthanc 1.9.4
-static const char* REMOVED_RANGES = "RemovedRanges";    // New in Orthanc 1.9.4
+static const char* REMOVED_RANGES = "RemovedRanges";      // New in Orthanc 1.9.4
+static const char* KEEP_SEQUENCES = "KeepSequences";      // New in Orthanc 1.9.4
+static const char* REMOVE_SEQUENCES = "RemoveSequences";  // New in Orthanc 1.9.4
+static const char* SEQUENCE_REPLACEMENTS = "SequenceReplacements";  // New in Orthanc 1.9.4
 void DicomModification::Serialize(Json::Value& value) const
 {
 if (identifierGenerator_ != NULL)
 {
 item.append(it->GetElementTo());
 ranges.append(item);
 }
 value[REMOVED_RANGES] = ranges;
+// New in Orthanc 1.9.4
+Json::Value lst = Json::arrayValue;
+for (ListOfPaths::const_iterator it = keepSequences_.begin(); it != keepSequences_.end(); ++it)
+{
+assert(it->GetPrefixLength() > 0);
+lst.append(it->Format());
+}
+value[KEEP_SEQUENCES] = lst;
+// New in Orthanc 1.9.4
+lst = Json::arrayValue;
+for (ListOfPaths::const_iterator it = removeSequences_.begin(); it != removeSequences_.end(); ++it)
+{
+assert(it->GetPrefixLength() > 0);
+lst.append(it->Format());
+}
+value[REMOVE_SEQUENCES] = lst;
+// New in Orthanc 1.9.4
+lst = Json::objectValue;
+for (SequenceReplacements::const_iterator it = sequenceReplacements_.begin(); it != sequenceReplacements_.end(); ++it)
+{
+assert(*it != NULL);
+assert((*it)->GetPath().GetPrefixLength() > 0);
+lst[(*it)->GetPath().Format()] = (*it)->GetValue();
+}
+value[SEQUENCE_REPLACEMENTS] = lst;
 }
 void DicomModification::UnserializeUidMap(ResourceType level,
 const Json::Value& serialized,
 const char* field)
 }
 }
 }
 }
 }
+// New in Orthanc 1.9.4
+if (serialized.isMember(KEEP_SEQUENCES))
+{
+const Json::Value& keep = serialized[KEEP_SEQUENCES];
+if (keep.type() != Json::arrayValue)
+{
+throw OrthancException(ErrorCode_BadFileFormat);
+}
+else
+{
+for (Json::Value::ArrayIndex i = 0; i < keep.size(); i++)
+{
+if (keep[i].type() != Json::stringValue)
+{
+throw OrthancException(ErrorCode_BadFileFormat);
+}
+else
+{
+keepSequences_.push_back(DicomPath::Parse(keep[i].asString()));
+}
+}
+}
+}
+// New in Orthanc 1.9.4
+if (serialized.isMember(REMOVE_SEQUENCES))
+{
+const Json::Value& remove = serialized[REMOVE_SEQUENCES];
+if (remove.type() != Json::arrayValue)
+{
+throw OrthancException(ErrorCode_BadFileFormat);
+}
+else
+{
+for (Json::Value::ArrayIndex i = 0; i < remove.size(); i++)
+{
+if (remove[i].type() != Json::stringValue)
+{
+throw OrthancException(ErrorCode_BadFileFormat);
+}
+else
+{
+removeSequences_.push_back(DicomPath::Parse(remove[i].asString()));
+}
+}
+}
+}
+// New in Orthanc 1.9.4
+if (serialized.isMember(SEQUENCE_REPLACEMENTS))
+{
+const Json::Value& replace = serialized[SEQUENCE_REPLACEMENTS];
+if (replace.type() != Json::objectValue)
+{
+throw OrthancException(ErrorCode_BadFileFormat);
+}
+else
+{
+Json::Value::Members members = replace.getMemberNames();
+for (size_t i = 0; i < members.size(); i++)
+{
+sequenceReplacements_.push_back(
+new SequenceReplacement(DicomPath::Parse(members[i]), replace[members[i]]));
+}
+}
+}
 }
 void DicomModification::SetPrivateCreator(const std::string &privateCreator)
 {

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomParsing/DicomModification.cpp @ 4687:fcd2dc7c8f31