comparison OrthancServer/Sources/ServerIndex.cpp @ 4583:42a846166fa3 db-changes

removing link to ServerIndex in ReadWriteTransaction
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Mar 2021 15:37:47 +0100
parents fb0379abb4a7
children b25941dcdbbe
comparison
equal deleted inserted replaced
4582:fb0379abb4a7 4583:42a846166fa3
1089 assert(writeOperations != NULL); 1089 assert(writeOperations != NULL);
1090 1090
1091 Transaction transaction(*this, TransactionType_ReadWrite); 1091 Transaction transaction(*this, TransactionType_ReadWrite);
1092 { 1092 {
1093 assert(listener_.get() != NULL); 1093 assert(listener_.get() != NULL);
1094 ReadWriteTransaction t(db_, *listener_, *this); 1094 ReadWriteTransaction t(db_, *listener_);
1095 writeOperations->Apply(t); 1095 writeOperations->Apply(t);
1096 } 1096 }
1097 transaction.Commit(); 1097 transaction.Commit();
1098 } 1098 }
1099 1099
3079 Operations operations(maximumStorageSize, maximumPatientCount); 3079 Operations operations(maximumStorageSize, maximumPatientCount);
3080 Apply(operations); 3080 Apply(operations);
3081 } 3081 }
3082 3082
3083 3083
3084 static void SetInstanceMetadata(ResourcesContent& content,
3085 std::map<MetadataType, std::string>& instanceMetadata,
3086 int64_t instance,
3087 MetadataType metadata,
3088 const std::string& value)
3089 {
3090 content.AddMetadata(instance, metadata, value);
3091 instanceMetadata[metadata] = value;
3092 }
3093
3094
3095 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata, 3084 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
3096 const DicomMap& dicomSummary, 3085 const DicomMap& dicomSummary,
3097 const Attachments& attachments, 3086 const Attachments& attachments,
3098 const MetadataMap& metadata, 3087 const MetadataMap& metadata,
3099 const DicomInstanceOrigin& origin, 3088 const DicomInstanceOrigin& origin,
3126 int64_t expectedInstances_; 3115 int64_t expectedInstances_;
3127 std::string hashPatient_; 3116 std::string hashPatient_;
3128 std::string hashStudy_; 3117 std::string hashStudy_;
3129 std::string hashSeries_; 3118 std::string hashSeries_;
3130 std::string hashInstance_; 3119 std::string hashInstance_;
3120
3121
3122 static void SetInstanceMetadata(ResourcesContent& content,
3123 std::map<MetadataType, std::string>& instanceMetadata,
3124 int64_t instance,
3125 MetadataType metadata,
3126 const std::string& value)
3127 {
3128 content.AddMetadata(instance, metadata, value);
3129 instanceMetadata[metadata] = value;
3130 }
3131
3131 3132
3132 static bool ComputeExpectedNumberOfInstances(int64_t& target, 3133 static bool ComputeExpectedNumberOfInstances(int64_t& target,
3133 const DicomMap& dicomSummary) 3134 const DicomMap& dicomSummary)
3134 { 3135 {
3135 try 3136 try