Mercurial > hg > orthanc
diff OrthancServer/Search/LookupIdentifierQuery.h @ 2121:7e8889bc95c6
refactoring
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 11:28:12 +0100 |
parents | b1291df2f780 |
children | a3a65de1840f |
line wrap: on
line diff
--- a/OrthancServer/Search/LookupIdentifierQuery.h Mon Nov 07 11:19:19 2016 +0100 +++ b/OrthancServer/Search/LookupIdentifierQuery.h Mon Nov 07 11:28:12 2016 +0100 @@ -32,7 +32,7 @@ #pragma once -#include "../ServerEnumerations.h" +#include "../ServerToolbox.h" #include "../IDatabaseWrapper.h" #include "SetOfResources.h" @@ -78,7 +78,7 @@ const std::string& value) : tag_(tag), type_(type), - value_(NormalizeIdentifier(value)) + value_(ServerToolbox::NormalizeIdentifier(value)) { } @@ -138,7 +138,7 @@ bool IsIdentifier(const DicomTag& tag) { - return IsIdentifier(tag, level_); + return ServerToolbox::IsIdentifier(tag, level_); } void AddConstraint(DicomTag tag, @@ -164,20 +164,6 @@ void Apply(SetOfResources& result, IDatabaseWrapper& database); - static void LoadIdentifiers(const DicomTag*& tags, - size_t& size, - ResourceType level); - - static bool IsIdentifier(const DicomTag& tag, - ResourceType level); - - static void StoreIdentifiers(IDatabaseWrapper& database, - int64_t resource, - ResourceType level, - const DicomMap& map); - - static std::string NormalizeIdentifier(const std::string& value); - void Print(std::ostream& s) const; }; }