Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/OrthancJobUnserializer.cpp @ 2853:52b017d22a4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New URI: "/studies/.../merge" to merge a study
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 02 Oct 2018 17:05:07 +0200
parents 218e2c864d1d
children 251614c2edac
comparison
equal deleted inserted replaced
2851:859e880ac9a8 2853:52b017d22a4f
46 #include "Operations/SystemCallOperation.h" 46 #include "Operations/SystemCallOperation.h"
47 47
48 #include "DicomModalityStoreJob.h" 48 #include "DicomModalityStoreJob.h"
49 #include "OrthancPeerStoreJob.h" 49 #include "OrthancPeerStoreJob.h"
50 #include "ResourceModificationJob.h" 50 #include "ResourceModificationJob.h"
51 #include "MergeStudyJob.h"
51 #include "SplitStudyJob.h" 52 #include "SplitStudyJob.h"
52 53
53 namespace Orthanc 54 namespace Orthanc
54 { 55 {
55 IJob* OrthancJobUnserializer::UnserializeJob(const Json::Value& source) 56 IJob* OrthancJobUnserializer::UnserializeJob(const Json::Value& source)
76 return new OrthancPeerStoreJob(context_, source); 77 return new OrthancPeerStoreJob(context_, source);
77 } 78 }
78 else if (type == "ResourceModification") 79 else if (type == "ResourceModification")
79 { 80 {
80 return new ResourceModificationJob(context_, source); 81 return new ResourceModificationJob(context_, source);
82 }
83 else if (type == "MergeStudy")
84 {
85 return new MergeStudyJob(context_, source);
81 } 86 }
82 else if (type == "SplitStudy") 87 else if (type == "SplitStudy")
83 { 88 {
84 return new SplitStudyJob(context_, source); 89 return new SplitStudyJob(context_, source);
85 } 90 }