Mercurial > hg > orthanc-databases

changeset 74:a4e440e65c68 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 04 Jan 2019 17:24:30 +0100
parents aa81c1c80c75
children 52c70007bb87
files Framework/Plugins/IndexBackend.cpp Framework/Plugins/IndexBackend.h Framework/Plugins/OrthancCppDatabasePlugin.h PostgreSQL/Plugins/PostgreSQLIndex.cpp PostgreSQL/Plugins/PostgreSQLIndex.h PostgreSQL/UnitTests/PostgreSQLTests.cpp
diffstat 6 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Plugins/IndexBackend.cpp	Fri Jan 04 17:06:34 2019 +0100
+++ b/Framework/Plugins/IndexBackend.cpp	Fri Jan 04 17:24:30 2019 +0100
@@ -1582,7 +1582,7 @@
   }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
   class IndexBackend::LookupFormatter : public Orthanc::ISqlLookupFormatter
   {
   private:
@@ -1651,7 +1651,7 @@
 #endif
 
   
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
   // New primitive since Orthanc 1.5.2
   void IndexBackend::LookupResources(const std::vector<Orthanc::DatabaseConstraint>& lookup,
                                      OrthancPluginResourceType queryLevel,
--- a/Framework/Plugins/IndexBackend.h	Fri Jan 04 17:06:34 2019 +0100
+++ b/Framework/Plugins/IndexBackend.h	Fri Jan 04 17:24:30 2019 +0100
@@ -258,7 +258,7 @@
     virtual void GetChildren(std::list<std::string>& childrenPublicIds,
                              int64_t id);
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     // New primitive since Orthanc 1.5.2
     virtual void LookupResources(const std::vector<Orthanc::DatabaseConstraint>& lookup,
                                  OrthancPluginResourceType queryLevel,
--- a/Framework/Plugins/OrthancCppDatabasePlugin.h	Fri Jan 04 17:06:34 2019 +0100
+++ b/Framework/Plugins/OrthancCppDatabasePlugin.h	Fri Jan 04 17:24:30 2019 +0100
@@ -251,7 +251,7 @@
     }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     void AnswerMatchingResource(const std::string& resourceId)
     {
       if (allowedAnswers_ != AllowedAnswers_All &&
@@ -269,7 +269,7 @@
 #endif
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     void AnswerMatchingResource(const std::string& resourceId,
                                 const std::string& someInstanceId)
     {
@@ -493,14 +493,14 @@
 
     virtual bool HasCreateInstance() const = 0;
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     virtual void LookupResources(const std::vector<Orthanc::DatabaseConstraint>& lookup,
                                  OrthancPluginResourceType queryLevel,
                                  uint32_t limit,
                                  bool requestSomeInstance) = 0;
 #endif
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     virtual void CreateInstance(OrthancPluginCreateInstanceResult& result,
                                 const char* hashPatient,
                                 const char* hashStudy,
@@ -1485,7 +1485,7 @@
     }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     /* Use GetOutput().AnswerResource() */
     static OrthancPluginErrorCode LookupResources(
       OrthancPluginDatabaseContext* context,
@@ -1517,7 +1517,7 @@
 #endif
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     static OrthancPluginErrorCode CreateInstance(OrthancPluginCreateInstanceResult* output,
                                                  void* payload,
                                                  const char* hashPatient,
@@ -1616,7 +1616,7 @@
 #  endif
 #endif
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
       extensions.lookupResources = LookupResources;   // New in Orthanc 1.5.2 (fast lookup)
 
       if (backend.HasCreateInstance())
--- a/PostgreSQL/Plugins/PostgreSQLIndex.cpp	Fri Jan 04 17:06:34 2019 +0100
+++ b/PostgreSQL/Plugins/PostgreSQLIndex.cpp	Fri Jan 04 17:24:30 2019 +0100
@@ -269,7 +269,7 @@
   }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
   void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result,
                                        const char* hashPatient,
                                        const char* hashStudy,
--- a/PostgreSQL/Plugins/PostgreSQLIndex.h	Fri Jan 04 17:06:34 2019 +0100
+++ b/PostgreSQL/Plugins/PostgreSQLIndex.h	Fri Jan 04 17:24:30 2019 +0100
@@ -83,7 +83,7 @@
       return true;
     }
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
     virtual void CreateInstance(OrthancPluginCreateInstanceResult& result,
                                 const char* hashPatient,
                                 const char* hashStudy,
--- a/PostgreSQL/UnitTests/PostgreSQLTests.cpp	Fri Jan 04 17:06:34 2019 +0100
+++ b/PostgreSQL/UnitTests/PostgreSQLTests.cpp	Fri Jan 04 17:24:30 2019 +0100
@@ -439,7 +439,7 @@
 }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
 TEST(PostgreSQLIndex, CreateInstance)
 {
   OrthancDatabases::PostgreSQLIndex db(globalParameters_);