orthanc: OrthancServer/Plugins/Engine/OrthancPlugins.cpp comparison

fix signature of OrthancPluginIncomingCStoreInstanceFilter

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 23 Feb 2022 11:09:43 +0100
parents	676e03e69703
children	47d734fa30f6

comparison

equal deleted inserted replaced

-:ce64d8995a41
+:309fb4f02704
 return true;
 }
-uint16_t OrthancPlugins::FilterIncomingCStoreInstance(const DicomInstanceToStore& instance,
+bool OrthancPlugins::FilterIncomingCStoreInstance(uint16_t& dimseStatus,
-const Json::Value& simplified)
+const DicomInstanceToStore& instance,
+const Json::Value& simplified)
 {
 DicomInstanceFromCallback wrapped(instance);
 boost::recursive_mutex::scoped_lock lock(pimpl_->invokeServiceMutex_);
 for (PImpl::IncomingCStoreInstanceFilters::const_iterator
 filter = pimpl_->incomingCStoreInstanceFilters_.begin();
 filter != pimpl_->incomingCStoreInstanceFilters_.end(); ++filter)
 {
-int32_t filterResult = (*filter) (reinterpret_cast<const OrthancPluginDicomInstance*>(&wrapped));
+int32_t result = (*filter) (&dimseStatus, reinterpret_cast<const OrthancPluginDicomInstance*>(&wrapped));
-if (filterResult >= 0 && filterResult <= 0xFFFF)
+if (result == 0)
 {
-return static_cast<uint16_t>(filterResult);
+// The instance must be discarded
+return false;
+}
+else if (result == 1)
+{
+// The instance is accepted
+return true;
 }
 else
 {
-// The callback is only allowed to answer uint16_t
+// Error
 throw OrthancException(ErrorCode_Plugin);
 }
 }
-return STATUS_Success;
+return true;  // By default, the instance is accepted
 }
 OrthancPluginReceivedInstanceAction OrthancPlugins::ApplyReceivedInstanceCallbacks(
 MallocMemoryBuffer& modified,

Mercurial > hg > orthanc