orthanc: OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp comparison

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 4988:8fba26292a9f

Housekeeper plugin: finalizing + integration tests ok

author	Alain Mazy <am@osimis.io>
date	Sat, 30 Apr 2022 19:39:40 +0200
parents	304514ce84ee
children	877bc3b96476

comparison

equal deleted inserted replaced

-:a25e74fad379
+:8fba26292a9f
 bool hasTransferSyntax,
 DicomTransferSyntax transferSyntax,
 bool hasPixelDataOffset,
 uint64_t pixelDataOffset,
 uint64_t maximumStorageSize,
-unsigned int maximumPatients)
+unsigned int maximumPatients,
+bool isReconstruct)
 {
 class Operations : public IReadWriteOperations
 {
 private:
 StoreStatus                          storeStatus_;
 DicomTransferSyntax                  transferSyntax_;
 bool                                 hasPixelDataOffset_;
 uint64_t                             pixelDataOffset_;
 uint64_t                             maximumStorageSize_;
 unsigned int                         maximumPatientCount_;
+bool                                 isReconstruct_;
 // Auto-computed fields
 bool          hasExpectedInstances_;
 int64_t       expectedInstances_;
 std::string   hashPatient_;
 bool hasTransferSyntax,
 DicomTransferSyntax transferSyntax,
 bool hasPixelDataOffset,
 uint64_t pixelDataOffset,
 uint64_t maximumStorageSize,
-unsigned int maximumPatientCount) :
+unsigned int maximumPatientCount,
+bool isReconstruct) :
 storeStatus_(StoreStatus_Failure),
 instanceMetadata_(instanceMetadata),
 dicomSummary_(dicomSummary),
 attachments_(attachments),
 metadata_(metadata),
 hasTransferSyntax_(hasTransferSyntax),
 transferSyntax_(transferSyntax),
 hasPixelDataOffset_(hasPixelDataOffset),
 pixelDataOffset_(pixelDataOffset),
 maximumStorageSize_(maximumStorageSize),
-maximumPatientCount_(maximumPatientCount)
+maximumPatientCount_(maximumPatientCount),
+isReconstruct_(isReconstruct)
 {
 hasExpectedInstances_ = ComputeExpectedNumberOfInstances(expectedInstances_, dicomSummary);
 instanceMetadata_.clear();
 return;
 }
 }
-// Warn about the creation of new resources. The order must be
+if (!isReconstruct_)  // don't signal new resources if this is a reconstruction
-// from instance to patient.
+{
+// Warn about the creation of new resources. The order must be
-// NB: In theory, could be sped up by grouping the underlying
+// from instance to patient.
-// calls to "transaction.LogChange()". However, this would only have an
-// impact when new patient/study/series get created, which
+// NB: In theory, could be sped up by grouping the underlying
-// occurs far less often that creating new instances. The
+// calls to "transaction.LogChange()". However, this would only have an
-// positive impact looks marginal in practice.
+// impact when new patient/study/series get created, which
-transaction.LogChange(instanceId, ChangeType_NewInstance, ResourceType_Instance, hashInstance_);
+// occurs far less often that creating new instances. The
+// positive impact looks marginal in practice.
-if (status.isNewSeries_)
+transaction.LogChange(instanceId, ChangeType_NewInstance, ResourceType_Instance, hashInstance_);
-{
-transaction.LogChange(status.seriesId_, ChangeType_NewSeries, ResourceType_Series, hashSeries_);
+if (status.isNewSeries_)
-}
+{
+transaction.LogChange(status.seriesId_, ChangeType_NewSeries, ResourceType_Series, hashSeries_);
-if (status.isNewStudy_)
+}
-{
-transaction.LogChange(status.studyId_, ChangeType_NewStudy, ResourceType_Study, hashStudy_);
+if (status.isNewStudy_)
-}
+{
+transaction.LogChange(status.studyId_, ChangeType_NewStudy, ResourceType_Study, hashStudy_);
-if (status.isNewPatient_)
+}
-{
-transaction.LogChange(status.patientId_, ChangeType_NewPatient, ResourceType_Patient, hashPatient_);
+if (status.isNewPatient_)
-}
+{
+transaction.LogChange(status.patientId_, ChangeType_NewPatient, ResourceType_Patient, hashPatient_);
+}
+}
 // Ensure there is enough room in the storage for the new instance
 uint64_t instanceSize = 0;
 for (Attachments::const_iterator it = attachments_.begin();
 it != attachments_.end(); ++it)
 {
 instanceSize += it->GetCompressedSize();
 }
-transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
+if (!isReconstruct_)  // reconstruction should not affect recycling
-instanceSize, hashPatient_ /* don't consider the current patient for recycling */);
+{
+transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
+instanceSize, hashPatient_ /* don't consider the current patient for recycling */);
+}
 // Attach the files to the newly created instance
 for (Attachments::const_iterator it = attachments_.begin();
 it != attachments_.end(); ++it)
 {
 }
 {
 ResourcesContent content(true /* new resource, metadata can be set */);
-// Populate the tags of the newly-created resources
+// Attach the user-specified metadata (in case of reconstruction, metadata_ contains all past metadata, including the system ones we want to keep)
-content.AddResource(instanceId, ResourceType_Instance, dicomSummary_);
-content.AddMetadata(instanceId, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance));  // New in Orthanc 1.11.0
-if (status.isNewSeries_)
-{
-content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary_);
-content.AddMetadata(status.seriesId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series));  // New in Orthanc 1.11.0
-}
-if (status.isNewStudy_)
-{
-content.AddResource(status.studyId_, ResourceType_Study, dicomSummary_);
-content.AddMetadata(status.studyId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study));  // New in Orthanc 1.11.0
-}
-if (status.isNewPatient_)
-{
-content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary_);
-content.AddMetadata(status.patientId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient));  // New in Orthanc 1.11.0
-}
-// Attach the user-specified metadata
 for (MetadataMap::const_iterator
 it = metadata_.begin(); it != metadata_.end(); ++it)
 {
 switch (it->first.first)
 {
 default:
 throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 }
+// Populate the tags of the newly-created resources
+content.AddResource(instanceId, ResourceType_Instance, dicomSummary_);
+SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance));  // New in Orthanc 1.11.0
+if (status.isNewSeries_)
+{
+content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary_);
+content.AddMetadata(status.seriesId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series));  // New in Orthanc 1.11.0
+}
+if (status.isNewStudy_)
+{
+content.AddResource(status.studyId_, ResourceType_Study, dicomSummary_);
+content.AddMetadata(status.studyId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study));  // New in Orthanc 1.11.0
+}
+if (status.isNewPatient_)
+{
+content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary_);
+content.AddMetadata(status.patientId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient));  // New in Orthanc 1.11.0
+}
 // Attach the auto-computed metadata for the patient/study/series levels
 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
 // New in Orthanc 1.9.0
 content.AddMetadata(status.seriesId_, MetadataType_RemoteAet,
 origin_.GetRemoteAetC());
 }
-// Attach the auto-computed metadata for the instance level,
-// reflecting these additions into the input metadata map
-SetInstanceMetadata(content, instanceMetadata_, instanceId,
-MetadataType_Instance_ReceptionDate, now);
-SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_RemoteAet,
-origin_.GetRemoteAetC());
-SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_Instance_Origin,
-EnumerationToString(origin_.GetRequestOrigin()));
 if (hasTransferSyntax_)
 {
 // New in Orthanc 1.2.0
 SetInstanceMetadata(content, instanceMetadata_, instanceId,
 MetadataType_Instance_TransferSyntax,
 GetTransferSyntaxUid(transferSyntax_));
 }
-{
+if (!isReconstruct_) // don't change origin metadata
+{
+// Attach the auto-computed metadata for the instance level,
+// reflecting these additions into the input metadata map
+SetInstanceMetadata(content, instanceMetadata_, instanceId,
+MetadataType_Instance_ReceptionDate, now);
+SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_RemoteAet,
+origin_.GetRemoteAetC());
+SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_Instance_Origin,
+EnumerationToString(origin_.GetRequestOrigin()));
 std::string s;
 if (origin_.LookupRemoteIp(s))
 {
 // New in Orthanc 1.4.0
 };
 Operations operations(instanceMetadata, dicomSummary, attachments, metadata, origin,
 overwrite, hasTransferSyntax, transferSyntax, hasPixelDataOffset,
-pixelDataOffset, maximumStorageSize, maximumPatients);
+pixelDataOffset, maximumStorageSize, maximumPatients, isReconstruct);
 Apply(operations);
 return operations.GetStoreStatus();
 }

Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 4988:8fba26292a9f