Mercurial > hg > orthanc
diff OrthancServer/Sources/Database/FindRequest.cpp @ 5681:77875b51cf95 find-refactoring
integration mainline->find-refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 09 Jul 2024 10:15:15 +0200 |
parents | dc96401dbe88 |
children | d0a264b803f1 |
line wrap: on
line diff
--- a/OrthancServer/Sources/Database/FindRequest.cpp Tue Jul 09 09:03:40 2024 +0200 +++ b/OrthancServer/Sources/Database/FindRequest.cpp Tue Jul 09 10:15:15 2024 +0200 @@ -182,49 +182,6 @@ } - void FindRequest::AddDicomTagConstraint(const DicomTagConstraint& constraint) - { - // This behaves like "StatelessDatabaseOperations::NormalizeLookup()" in Orthanc <= 1.12.3 - - if (mainDicomTagsRegistry_.get() == NULL) - { - // Lazy creation of the registry of main DICOM tags - mainDicomTagsRegistry_.reset(new MainDicomTagsRegistry()); - } - - ResourceType level; - DicomTagType type; - - mainDicomTagsRegistry_->LookupTag(level, type, constraint.GetTag()); - - if (type == DicomTagType_Identifier || - type == DicomTagType_Main) - { - // Use the fact that patient-level tags are copied at the study level - if (level == ResourceType_Patient && - GetLevel() != ResourceType_Patient) - { - level = ResourceType_Study; - } - - dicomTagConstraints_.push_back(constraint.ConvertToDatabaseConstraint(level, type)); - } - } - - - const DatabaseConstraint& FindRequest::GetDicomTagConstraint(size_t index) const - { - if (index >= dicomTagConstraints_.size()) - { - throw OrthancException(ErrorCode_ParameterOutOfRange); - } - else - { - return dicomTagConstraints_[index]; - } - } - - void FindRequest::SetLimits(uint64_t since, uint64_t count) {