Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.h @ 5427:111e21b4f8bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix transcoded instance caching
author Alain Mazy <am@osimis.io>
date Fri, 17 Nov 2023 08:22:17 +0100
parents c65e036d649b
children 4be5f117aa0d
comparison
equal deleted inserted replaced
5426:c65e036d649b 5427:111e21b4f8bc
377 const std::string& instancePublicId); 377 const std::string& instancePublicId);
378 378
379 void ReadDicom(std::string& dicom, 379 void ReadDicom(std::string& dicom,
380 const std::string& instancePublicId); 380 const std::string& instancePublicId);
381 381
382 void ReadDicom(std::string& dicom,
383 std::string& attachmentId,
384 const std::string& instancePublicId);
385
382 void ReadDicomForHeader(std::string& dicom, 386 void ReadDicomForHeader(std::string& dicom,
383 const std::string& instancePublicId); 387 const std::string& instancePublicId);
384 388
385 bool ReadDicomUntilPixelData(std::string& dicom, 389 bool ReadDicomUntilPixelData(std::string& dicom,
386 const std::string& instancePublicId); 390 const std::string& instancePublicId);
387 391
388 // This method is for low-level operations on "/instances/.../attachments/..." 392 // This method is for low-level operations on "/instances/.../attachments/..."
389 void ReadAttachment(std::string& result, 393 void ReadAttachment(std::string& result,
390 int64_t& revision, 394 int64_t& revision,
395 std::string& attachmentId,
391 const std::string& instancePublicId, 396 const std::string& instancePublicId,
392 FileContentType content, 397 FileContentType content,
393 bool uncompressIfNeeded, 398 bool uncompressIfNeeded,
394 bool skipCache = false); 399 bool skipCache = false);
395 400
557 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE; 562 bool allowNewSopInstanceUid) ORTHANC_OVERRIDE;
558 563
559 virtual bool TranscodeWithCache(std::string& target, 564 virtual bool TranscodeWithCache(std::string& target,
560 const std::string& source, 565 const std::string& source,
561 const std::string& sourceInstanceId, 566 const std::string& sourceInstanceId,
567 const std::string& attachmentId, // for the storage cache
562 DicomTransferSyntax targetSyntax); 568 DicomTransferSyntax targetSyntax);
563 569
564 bool IsTranscodeDicomProtocol() const 570 bool IsTranscodeDicomProtocol() const
565 { 571 {
566 return transcodeDicomProtocol_; 572 return transcodeDicomProtocol_;