Mercurial > hg > orthanc

changeset 4799:0bd98c52474b filter-store-instance

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes after sdk tests
author Alain Mazy <am@osimis.io>
date Fri, 15 Oct 2021 18:31:20 +0200
parents 94616af363ec
children 2ca4213fb50a 241d83204c23
files OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Sources/ServerContext.cpp
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Fri Oct 01 18:36:45 2021 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Fri Oct 15 18:31:20 2021 +0200
@@ -2521,8 +2521,6 @@
   }
 
 
-    void RegisterIncomingCStoreInstanceFilter(const void* parameters);
-
   void OrthancPlugins::RegisterRefreshMetricsCallback(const void* parameters)
   {
     const _OrthancPluginRegisterRefreshMetricsCallback& p = 
@@ -5001,6 +4999,10 @@
         RegisterIncomingDicomInstanceFilter(parameters);
         return true;
 
+      case _OrthancPluginService_RegisterIncomingCStoreInstanceFilter:
+        RegisterIncomingCStoreInstanceFilter(parameters);
+        return true;
+
       case _OrthancPluginService_RegisterRefreshMetricsCallback:
         RegisterRefreshMetricsCallback(parameters);
         return true;
--- a/OrthancServer/Sources/ServerContext.cpp	Fri Oct 01 18:36:45 2021 +0200
+++ b/OrthancServer/Sources/ServerContext.cpp	Fri Oct 15 18:31:20 2021 +0200
@@ -565,7 +565,7 @@
             if (dicom.GetOrigin().GetRequestOrigin() == Orthanc::RequestOrigin_DicomProtocol)
             {
               uint16_t filterResult = it->GetListener().FilterIncomingCStoreInstance(dicom, simplifiedTags);
-              if (it->GetListener().FilterIncomingCStoreInstance(dicom, simplifiedTags) != 0x0000)
+              if (filterResult != 0x0000)
               {
                 result.SetStatus(StoreStatus_FilteredOut);
                 result.SetCStoreStatusCode(filterResult);