Mercurial > hg > orthanc
comparison OrthancServer/Sources/ServerContext.cpp @ 4205:d962a2996637
cppcheck
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 17 Sep 2020 17:58:19 +0200 |
parents | 4d42408da117 |
children | 8e069a7e1c11 |
comparison
equal
deleted
inserted
replaced
4204:318c16cfccab | 4205:d962a2996637 |
---|---|
187 { | 187 { |
188 std::string serialized; | 188 std::string serialized; |
189 if (index_.LookupGlobalProperty(serialized, GlobalProperty_JobsRegistry)) | 189 if (index_.LookupGlobalProperty(serialized, GlobalProperty_JobsRegistry)) |
190 { | 190 { |
191 LOG(WARNING) << "Reloading the jobs from the last execution of Orthanc"; | 191 LOG(WARNING) << "Reloading the jobs from the last execution of Orthanc"; |
192 OrthancJobUnserializer unserializer(*this); | |
193 | 192 |
194 try | 193 try |
195 { | 194 { |
195 OrthancJobUnserializer unserializer(*this); | |
196 jobsEngine_.LoadRegistryFromString(unserializer, serialized); | 196 jobsEngine_.LoadRegistryFromString(unserializer, serialized); |
197 } | 197 } |
198 catch (OrthancException& e) | 198 catch (OrthancException& e) |
199 { | 199 { |
200 LOG(WARNING) << "Cannot unserialize the jobs engine, starting anyway: " << e.What(); | 200 LOG(WARNING) << "Cannot unserialize the jobs engine, starting anyway: " << e.What(); |
1166 bool isDicomAsJsonNeeded_; | 1166 bool isDicomAsJsonNeeded_; |
1167 bool complete_; | 1167 bool complete_; |
1168 Studies studies_; | 1168 Studies studies_; |
1169 | 1169 |
1170 public: | 1170 public: |
1171 ModalitiesInStudyVisitor(bool isDicomAsJsonNeeded) : | 1171 explicit ModalitiesInStudyVisitor(bool isDicomAsJsonNeeded) : |
1172 isDicomAsJsonNeeded_(isDicomAsJsonNeeded) | 1172 isDicomAsJsonNeeded_(isDicomAsJsonNeeded), |
1173 complete_(false) | |
1173 { | 1174 { |
1174 } | 1175 } |
1175 | 1176 |
1176 ~ModalitiesInStudyVisitor() | 1177 ~ModalitiesInStudyVisitor() |
1177 { | 1178 { |
1182 } | 1183 } |
1183 | 1184 |
1184 studies_.clear(); | 1185 studies_.clear(); |
1185 } | 1186 } |
1186 | 1187 |
1187 virtual bool IsDicomAsJsonNeeded() const | 1188 virtual bool IsDicomAsJsonNeeded() const ORTHANC_OVERRIDE |
1188 { | 1189 { |
1189 return isDicomAsJsonNeeded_; | 1190 return isDicomAsJsonNeeded_; |
1190 } | 1191 } |
1191 | 1192 |
1192 virtual void MarkAsComplete() | 1193 virtual void MarkAsComplete() ORTHANC_OVERRIDE |
1193 { | 1194 { |
1194 complete_ = true; | 1195 complete_ = true; |
1195 } | 1196 } |
1196 | 1197 |
1197 virtual void Visit(const std::string& publicId, | 1198 virtual void Visit(const std::string& publicId, |
1198 const std::string& instanceId, | 1199 const std::string& instanceId, |
1199 const DicomMap& seriesTags, | 1200 const DicomMap& seriesTags, |
1200 const Json::Value* dicomAsJson) | 1201 const Json::Value* dicomAsJson) ORTHANC_OVERRIDE |
1201 { | 1202 { |
1202 std::string studyInstanceUid; | 1203 std::string studyInstanceUid; |
1203 if (seriesTags.LookupStringValue(studyInstanceUid, DICOM_TAG_STUDY_INSTANCE_UID, false)) | 1204 if (seriesTags.LookupStringValue(studyInstanceUid, DICOM_TAG_STUDY_INSTANCE_UID, false)) |
1204 { | 1205 { |
1205 Studies::iterator found = studies_.find(studyInstanceUid); | 1206 Studies::iterator found = studies_.find(studyInstanceUid); |
1224 } | 1225 } |
1225 | 1226 |
1226 void Forward(ILookupVisitor& callerVisitor, | 1227 void Forward(ILookupVisitor& callerVisitor, |
1227 size_t since, | 1228 size_t since, |
1228 size_t limit) const | 1229 size_t limit) const |
1229 { | 1230 { |
1230 size_t index = 0; | 1231 size_t index = 0; |
1231 size_t countForwarded = 0; | 1232 size_t countForwarded = 0; |
1232 | 1233 |
1233 for (Studies::const_iterator it = studies_.begin(); it != studies_.end(); ++it, index++) | 1234 for (Studies::const_iterator it = studies_.begin(); it != studies_.end(); ++it, index++) |
1234 { | 1235 { |