diff OrthancServer/Search/WildcardConstraint.cpp @ 1756:03b030680e3d db-changes

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Oct 2015 12:14:06 +0100
parents fb569ee09a69
children af6840eb23ee
line wrap: on
line diff
--- a/OrthancServer/Search/WildcardConstraint.cpp	Wed Oct 28 12:02:15 2015 +0100
+++ b/OrthancServer/Search/WildcardConstraint.cpp	Wed Oct 28 12:14:06 2015 +0100
@@ -45,16 +45,13 @@
 
 
   WildcardConstraint::WildcardConstraint(const WildcardConstraint& other) :
-    IFindConstraint(other.GetTag()),
     pimpl_(new PImpl(*other.pimpl_))
   {
   }
 
 
-  WildcardConstraint::WildcardConstraint(const DicomTag& tag, 
-                                         const std::string& wildcard,
+  WildcardConstraint::WildcardConstraint(const std::string& wildcard,
                                          bool isCaseSensitive) :
-    IFindConstraint(tag),
     pimpl_(new PImpl)
   {
     pimpl_->wildcard_ = wildcard;
@@ -76,8 +73,9 @@
     return boost::regex_match(value, pimpl_->pattern_);
   }
 
-  void WildcardConstraint::Setup(LookupIdentifierQuery& lookup) const
+  void WildcardConstraint::Setup(LookupIdentifierQuery& lookup,
+                                 const DicomTag& tag) const
   {
-    lookup.AddConstraint(GetTag(), IdentifierConstraintType_Wildcard, pimpl_->wildcard_);
+    lookup.AddConstraint(tag, IdentifierConstraintType_Wildcard, pimpl_->wildcard_);
   }
 }