Mercurial > hg > orthanc-databases

diff Framework/Plugins/IndexBackend.cpp @ 551:1a23f1ce3b98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move classes DatabaseConstraint and ISqlLookupFormatter into namespace OrthancDatabases
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Sep 2024 15:19:28 +0200
parents aff02ad9fbbc
children 987460ae14c9
line wrap: on
line diff
--- a/Framework/Plugins/IndexBackend.cpp	Mon Sep 09 13:29:45 2024 +0200
+++ b/Framework/Plugins/IndexBackend.cpp	Mon Sep 09 15:19:28 2024 +0200
@@ -2021,7 +2021,7 @@
 
 
 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
-  class IndexBackend::LookupFormatter : public Orthanc::ISqlLookupFormatter
+  class IndexBackend::LookupFormatter : public ISqlLookupFormatter
   {
   private:
     Dialect     dialect_;
@@ -2052,7 +2052,7 @@
 
     virtual std::string FormatResourceType(Orthanc::ResourceType level)
     {
-      return boost::lexical_cast<std::string>(Orthanc::Plugins::Convert(level));
+      return boost::lexical_cast<std::string>(Plugins::Convert(level));
     }
 
     virtual std::string FormatWildcardEscape()
@@ -2101,24 +2101,24 @@
   // New primitive since Orthanc 1.5.2
   void IndexBackend::LookupResources(IDatabaseBackendOutput& output,
                                      DatabaseManager& manager,
-                                     const Orthanc::DatabaseConstraints& lookup,
+                                     const DatabaseConstraints& lookup,
                                      OrthancPluginResourceType queryLevel_,
                                      const std::set<std::string>& labels,
-                                     Orthanc::LabelsConstraint labelsConstraint,
+                                     LabelsConstraint labelsConstraint,
                                      uint32_t limit,
                                      bool requestSomeInstance)
   {
     LookupFormatter formatter(manager.GetDialect());
-    Orthanc::ResourceType queryLevel = Orthanc::Plugins::Convert(queryLevel_);
+    Orthanc::ResourceType queryLevel = Plugins::Convert(queryLevel_);
     Orthanc::ResourceType lowerLevel, upperLevel;
-    Orthanc::ISqlLookupFormatter::GetLookupLevels(lowerLevel, upperLevel,  queryLevel, lookup);
+    ISqlLookupFormatter::GetLookupLevels(lowerLevel, upperLevel,  queryLevel, lookup);
 
     std::string sql;
     bool enableNewStudyCode = true;
 
     if (enableNewStudyCode && lowerLevel == queryLevel && upperLevel == queryLevel)
     {
-      Orthanc::ISqlLookupFormatter::ApplySingleLevel(sql, formatter, lookup, queryLevel, labels, labelsConstraint, limit);
+      ISqlLookupFormatter::ApplySingleLevel(sql, formatter, lookup, queryLevel, labels, labelsConstraint, limit);
 
       if (requestSomeInstance)
       {
@@ -2167,7 +2167,7 @@
     }
     else
     {
-      Orthanc::ISqlLookupFormatter::Apply(sql, formatter, lookup, queryLevel, labels, labelsConstraint, limit);      
+      ISqlLookupFormatter::Apply(sql, formatter, lookup, queryLevel, labels, labelsConstraint, limit);
 
       if (requestSomeInstance)
       {