orthanc: OrthancServer/Sources/ServerContext.h comparison

comparison OrthancServer/Sources/ServerContext.h @ 4899:3ab57510f6dd proto-filter-instance-returning-error-code

integration mainline->proto-filter-instance-returning-error-code

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sun, 20 Feb 2022 12:59:30 +0100
parents	6eff25f70121
children	309fb4f02704

comparison

equal deleted inserted replaced

-:656784ac6759
+:3ab57510f6dd
 /**
 * Orthanc - A Lightweight, RESTful DICOM Store
 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
 * Department, University Hospital of Liege, Belgium
-* Copyright (C) 2017-2021 Osimis S.A., Belgium
+* Copyright (C) 2017-2022 Osimis S.A., Belgium
+* Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
 *
 * This program is free software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
-*
-* In addition, as a special exception, the copyright holders of this
-* program give permission to link the code of its release with the
-* OpenSSL project's "OpenSSL" library (or with modified versions of it
-* that use the same license as the "OpenSSL" library), and distribute
-* the linked executables. You must obey the GNU General Public License
-* in all respects for all of the code used other than "OpenSSL". If you
-* modify file(s) with this exception, you may extend this exception to
-* your version of the file(s), but you are not obligated to do so. If
-* you do not wish to do so, delete this exception statement from your
-* version. If you delete this exception statement from all source files
-* in the program, then also delete it here.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.
 #include "../../OrthancFramework/Sources/DicomFormat/DicomElement.h"
 #include "../../OrthancFramework/Sources/DicomParsing/DicomModification.h"
 #include "../../OrthancFramework/Sources/DicomParsing/IDicomTranscoder.h"
 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomCache.h"
+#include "../../OrthancFramework/Sources/FileStorage/StorageCache.h"
 #include "../../OrthancFramework/Sources/MultiThreading/Semaphore.h"
 namespace Orthanc
 {
 const std::string& instanceId,
 const DicomMap& mainDicomTags,
 const Json::Value* dicomAsJson) = 0;
 };
+struct StoreResult
+{
+private:
+StoreStatus  status_;
+uint16_t     cstoreStatusCode_;
+// uint16_t     httpStatusCode_; // for future use
+public:
+StoreResult();
+void SetStatus(StoreStatus status)
+{
+status_ = status;
+}
+StoreStatus GetStatus()
+{
+return status_;
+}
+void SetCStoreStatusCode(uint16_t statusCode)
+{
+cstoreStatusCode_ = statusCode;
+}
+uint16_t GetCStoreStatusCode()
+{
+return cstoreStatusCode_;
+}
+};
 private:
 class LuaServerListener : public IServerListener
 {
 private:
 virtual bool FilterIncomingInstance(const DicomInstanceToStore& instance,
 const Json::Value& simplified) ORTHANC_OVERRIDE
 {
 return context_.filterLua_.FilterIncomingInstance(instance, simplified);
+}
+virtual uint16_t FilterIncomingCStoreInstance(const DicomInstanceToStore& instance,
+const Json::Value& simplified) ORTHANC_OVERRIDE
+{
+return context_.filterLua_.FilterIncomingCStoreInstance(instance, simplified);
 }
 };
 class ServerListener
 {
 virtual void SignalJobFailure(const std::string& jobId) ORTHANC_OVERRIDE;
 ServerIndex index_;
 IStorageArea& area_;
+StorageCache storageCache_;
 bool compressionEnabled_;
 bool storeMD5_;
 Semaphore largeDicomThrottler_;  // New in Orthanc 1.9.0 (notably for very large DICOM files in WSI)
 DicomTransferSyntax preferredTransferSyntax_;
 boost::mutex dynamicOptionsMutex_;
 bool isUnknownSopClassAccepted_;
 std::set<DicomTransferSyntax>  acceptedTransferSyntaxes_;
-StoreStatus StoreAfterTranscoding(std::string& resultPublicId,
+StoreResult StoreAfterTranscoding(std::string& resultPublicId,
 DicomInstanceToStore& dicom,
 StoreInstanceMode mode);
 void ApplyInternal(ILookupVisitor& visitor,
 const DatabaseLookup& lookup,
 bool loadJobsFromDatabase);
 ServerIndex& GetIndex()
 {
 return index_;
+}
+void SetMaximumStorageCacheSize(size_t size)
+{
+return storageCache_.SetMaximumSize(size);
 }
 void SetCompressionEnabled(bool enabled);
 bool IsCompressionEnabled() const
 size_t size,
 bool hasOldRevision,
 int64_t oldRevision,
 const std::string& oldMD5);
-StoreStatus Store(std::string& resultPublicId,
+StoreResult Store(std::string& resultPublicId,
 DicomInstanceToStore& dicom,
 StoreInstanceMode mode);
 void AnswerAttachment(RestApiOutput& output,
 const std::string& resourceId,
 void ReadDicomAsJson(Json::Value& result,
 const std::string& instancePublicId);
 void ReadDicom(std::string& dicom,
 const std::string& instancePublicId);
+void ReadDicomForHeader(std::string& dicom,
+const std::string& instancePublicId);
 bool ReadDicomUntilPixelData(std::string& dicom,
 const std::string& instancePublicId);
 // This method is for low-level operations on "/instances/.../attachments/..."
 void ReadAttachment(std::string& result,

Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.h @ 4899:3ab57510f6dd proto-filter-instance-returning-error-code