Mercurial > hg > orthanc

annotate OrthancServer/Scheduler/ModifyInstanceCommand.cpp @ 2299:03982a0db696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #29 (more consistent handling of the "--upgrade" argument)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 05 Jul 2017 15:52:47 +0200
parents a3a65de1840f
children 878b59270859
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1698
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1099
diff changeset
4 * Department, University Hospital of Liege, Belgium
2244
a3a65de1840f shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
5 * Copyright (C) 2017 Osimis, Belgium
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * In addition, as a special exception, the copyright holders of this
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * program give permission to link the code of its release with the
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * the linked executables. You must obey the GNU General Public License
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * you do not wish to do so, delete this exception statement from your
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * version. If you delete this exception statement from all source files
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 * in the program, then also delete it here.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
1624
0a2ad4a6858f fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1572
diff changeset
34 #include "../PrecompiledHeadersServer.h"
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "ModifyInstanceCommand.h"
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1341
diff changeset
37 #include "../../Core/Logging.h"
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 namespace Orthanc
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 {
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
41 ModifyInstanceCommand::ModifyInstanceCommand(ServerContext& context,
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
42 RequestOrigin origin,
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
43 DicomModification* modification) :
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
44 context_(context),
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
45 origin_(origin),
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
46 modification_(modification)
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
47 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
48 modification_->SetAllowManualIdentifiers(true);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
49
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
50 if (modification_->IsReplaced(DICOM_TAG_PATIENT_ID))
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
51 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
52 modification_->SetLevel(ResourceType_Patient);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
53 }
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
54 else if (modification_->IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
55 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
56 modification_->SetLevel(ResourceType_Study);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
57 }
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
58 else if (modification_->IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
59 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
60 modification_->SetLevel(ResourceType_Series);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
61 }
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
62 else
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
63 {
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
64 modification_->SetLevel(ResourceType_Instance);
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
65 }
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
66
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
67 if (origin_ != RequestOrigin_Lua)
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
68 {
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
69 // TODO If issued from HTTP, "remoteIp" and "username" must be provided
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
70 throw OrthancException(ErrorCode_NotImplemented);
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
71 }
1341
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
72 }
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
73
479e31b13de5 Allow replacing PatientID/StudyInstanceUID/SeriesInstanceUID from Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
74
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
75 ModifyInstanceCommand::~ModifyInstanceCommand()
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
76 {
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
77 if (modification_)
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
78 {
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
79 delete modification_;
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
80 }
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
81 }
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
82
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
83
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 bool ModifyInstanceCommand::Apply(ListOfStrings& outputs,
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 const ListOfStrings& inputs)
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 {
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 for (ListOfStrings::const_iterator
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 it = inputs.begin(); it != inputs.end(); ++it)
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 {
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 LOG(INFO) << "Modifying resource " << *it;
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
92 try
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 {
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
94 std::auto_ptr<ParsedDicomFile> modified;
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
96 {
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
97 ServerContext::DicomCacheLocker lock(context_, *it);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
98 modified.reset(lock.GetDicom().Clone());
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
99 }
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
100
1698
d78b87f93bcf DicomModification use Json::Value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1624
diff changeset
101 modification_->Apply(*modified);
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
103 DicomInstanceToStore toStore;
1572
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
104 assert(origin_ == RequestOrigin_Lua);
904096e7367e More information about the origin request in OnStoredInstance() callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1486
diff changeset
105 toStore.SetLuaOrigin();
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
106 toStore.SetParsedDicomFile(*modified);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
107 // TODO other metadata
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
108 toStore.AddMetadata(ResourceType_Instance, MetadataType_ModifiedFrom, *it);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
109
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
110 std::string modifiedId;
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
111 context_.Store(modifiedId, toStore);
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112
1099
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
113 // Only chain with other commands if this command succeeds
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
114 outputs.push_back(modifiedId);
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
115 }
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
116 catch (OrthancException& e)
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
117 {
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
118 LOG(ERROR) << "Unable to modify instance " << *it << " in a Lua script: " << e.What();
060e8918d7a4 More fault-tolerant commands in Lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1008
diff changeset
119 }
1008
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 }
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 return true;
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 }
187ed107a59f modify command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 }