Mercurial > hg > orthanc

changeset 3098:717efd0989f9 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed macro
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 06 Jan 2019 12:43:19 +0100
parents ac72032d69a2
children 9c71abbff70f
files OrthancServer/Search/DatabaseConstraint.cpp OrthancServer/Search/DatabaseConstraint.h Plugins/Include/orthanc/OrthancCDatabasePlugin.h
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Search/DatabaseConstraint.cpp	Sat Jan 05 18:51:36 2019 +0100
+++ b/OrthancServer/Search/DatabaseConstraint.cpp	Sun Jan 06 12:43:19 2019 +0100
@@ -89,7 +89,7 @@
 #endif
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     OrthancPluginConstraintType Convert(ConstraintType constraint)
     {
       switch (constraint)
@@ -116,7 +116,7 @@
 #endif    
 
     
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     ConstraintType Convert(OrthancPluginConstraintType constraint)
     {
       switch (constraint)
@@ -166,7 +166,7 @@
   }      
 
     
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
   DatabaseConstraint::DatabaseConstraint(const OrthancPluginDatabaseConstraint& constraint) :
     level_(Plugins::Convert(constraint.level)),
     tag_(constraint.tagGroup, constraint.tagElement),
@@ -218,7 +218,7 @@
   }
 
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
   void DatabaseConstraint::EncodeForPlugins(OrthancPluginDatabaseConstraint& constraint,
                                             std::vector<const char*>& tmpValues) const
   {
--- a/OrthancServer/Search/DatabaseConstraint.h	Sat Jan 05 18:51:36 2019 +0100
+++ b/OrthancServer/Search/DatabaseConstraint.h	Sun Jan 06 12:43:19 2019 +0100
@@ -36,14 +36,14 @@
 #include "../../Core/DicomFormat/DicomMap.h"
 #include "../ServerEnumerations.h"
 
-#define ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 0
+#define ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT 0
 
 #if ORTHANC_ENABLE_PLUGINS == 1
 #  include <orthanc/OrthancCDatabasePlugin.h>
 #  if defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE)      // Macro introduced in 1.3.1
 #    if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 2)
-#      undef  ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1
-#      define ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 1
+#      undef  ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT
+#      define ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT 1
 #    endif
 #  endif
 #endif
@@ -60,11 +60,11 @@
     ResourceType Convert(OrthancPluginResourceType type);
 #endif
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     OrthancPluginConstraintType Convert(ConstraintType constraint);
 #endif
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     ConstraintType Convert(OrthancPluginConstraintType constraint);
 #endif
   }
@@ -91,7 +91,7 @@
                        bool caseSensitive,
                        bool mandatory);
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     DatabaseConstraint(const OrthancPluginDatabaseConstraint& constraint);
 #endif
     
@@ -136,7 +136,7 @@
 
     bool IsMatch(const DicomMap& dicom) const;
 
-#if ORTHANC_PLUGINS_HAS_DATABASE_OPTIMIZATIONS_1 == 1
+#if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
     void EncodeForPlugins(OrthancPluginDatabaseConstraint& constraint,
                           std::vector<const char*>& tmpValues) const;
 #endif    
--- a/Plugins/Include/orthanc/OrthancCDatabasePlugin.h	Sat Jan 05 18:51:36 2019 +0100
+++ b/Plugins/Include/orthanc/OrthancCDatabasePlugin.h	Sun Jan 06 12:43:19 2019 +0100
@@ -121,7 +121,7 @@
     const char*                sopInstanceUid;
   } OrthancPluginExportedResource;
 
-  typedef struct
+  typedef struct   /* New in Orthanc 1.5.2 */
   {
     OrthancPluginResourceType    level;
     uint16_t                     tagGroup;