Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.h @ 5058:d4e5ca0c9307

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the "Never" option of the "StorageAccessOnFind" that was sill accessing files (bug introduced in 1.11.0)
author Alain Mazy <am@osimis.io>
date Wed, 03 Aug 2022 10:49:50 +0200
parents 22966345eaba
children d7274e43ea7c 7547c7dfd017
comparison
equal deleted inserted replaced
5057:e6f26be401fa 5058:d4e5ca0c9307
543 543
544 bool ExpandResource(Json::Value& target, 544 bool ExpandResource(Json::Value& target,
545 const std::string& publicId, 545 const std::string& publicId,
546 ResourceType level, 546 ResourceType level,
547 DicomToJsonFormat format, 547 DicomToJsonFormat format,
548 const std::set<DicomTag>& requestedTags); 548 const std::set<DicomTag>& requestedTags,
549 bool allowStorageAccess);
549 550
550 bool ExpandResource(Json::Value& target, 551 bool ExpandResource(Json::Value& target,
551 const std::string& publicId, 552 const std::string& publicId,
552 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) 553 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available)
553 const std::string& instanceId, // optional: the id of an instance for the resource 554 const std::string& instanceId, // optional: the id of an instance for the resource
554 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource 555 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource
555 ResourceType level, 556 ResourceType level,
556 DicomToJsonFormat format, 557 DicomToJsonFormat format,
557 const std::set<DicomTag>& requestedTags); 558 const std::set<DicomTag>& requestedTags,
559 bool allowStorageAccess);
558 560
559 bool ExpandResource(ExpandedResource& target, 561 bool ExpandResource(ExpandedResource& target,
560 const std::string& publicId, 562 const std::string& publicId,
561 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) 563 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available)
562 const std::string& instanceId, // optional: the id of an instance for the resource 564 const std::string& instanceId, // optional: the id of an instance for the resource
563 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource 565 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource
564 ResourceType level, 566 ResourceType level,
565 const std::set<DicomTag>& requestedTags, 567 const std::set<DicomTag>& requestedTags,
566 ExpandResourceDbFlags expandFlags); 568 ExpandResourceDbFlags expandFlags,
567 569 bool allowStorageAccess);
570
571 FindStorageAccessMode GetFindStorageAccessMode() const
572 {
573 return findStorageAccessMode_;
574 }
568 }; 575 };
569 } 576 }