comparison OrthancServer/ServerJobs/MergeStudyJob.cpp @ 3140:977158ab0623

making db-changes the new mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 17 Jan 2019 18:32:42 +0100
parents beeeb6096f27
children 69e49fc044f8
comparison
equal deleted inserted replaced
3138:ab46e537f92e 3140:977158ab0623
34 #include "MergeStudyJob.h" 34 #include "MergeStudyJob.h"
35 35
36 #include "../../Core/DicomParsing/FromDcmtkBridge.h" 36 #include "../../Core/DicomParsing/FromDcmtkBridge.h"
37 #include "../../Core/Logging.h" 37 #include "../../Core/Logging.h"
38 #include "../../Core/SerializationToolbox.h" 38 #include "../../Core/SerializationToolbox.h"
39 #include "../ServerContext.h"
39 40
40 41
41 namespace Orthanc 42 namespace Orthanc
42 { 43 {
43 void MergeStudyJob::AddSourceSeriesInternal(const std::string& series) 44 void MergeStudyJob::AddSourceSeriesInternal(const std::string& series)