annotate Plugin/ResourceHierarchyCache.cpp @ 200:cf368ba6ba62 0.8.1

0.8.1
author Alain Mazy <am@orthanc.team>
date Wed, 03 Jul 2024 08:59:31 +0200
parents c4b908970ae4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Advanced authorization plugin for Orthanc
68
1a13c4fbc9a1 copyrights
Alain Mazy <am@osimis.io>
parents: 46
diff changeset
3 * Copyright (C) 2017-2023 Osimis S.A., Belgium
150
Alain Mazy <am@osimis.io>
parents: 110
diff changeset
4 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
188
c4b908970ae4 updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 150
diff changeset
5 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 #include "ResourceHierarchyCache.h"
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
23 #include <Logging.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 31
diff changeset
24 #include <OrthancException.h>
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include <boost/lexical_cast.hpp>
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
27 #include <Toolbox.h>
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 namespace OrthancPlugins
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 std::string ResourceHierarchyCache::ComputeKey(Orthanc::ResourceType level,
43
14594077ad3a Release 0.2.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 32
diff changeset
32 const std::string& identifier) const
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 return boost::lexical_cast<std::string>(level) + "|" + identifier;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 void ResourceHierarchyCache::LinkParent(const OrthancResource& child,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 const OrthancResource& parent)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 LOG(INFO) << "Linking " << Orthanc::EnumerationToString(child.GetLevel())
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 << " \"" << child.GetIdentifier() << "\" to its parent "
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 << Orthanc::EnumerationToString(parent.GetLevel())
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 << " \"" << parent.GetIdentifier() << "\"";
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 cache_->Store(ComputeKey(child), parent.GetIdentifier(), 0 /* no expiration */);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
49 void ResourceHierarchyCache::GetLabels(std::set<std::string>& labels,
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
50 const OrthancResource& resource)
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
51 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
52 labels.clear();
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
53
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
54 std::string key = ComputeKey(resource);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
55
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
56 std::string serializedLabels;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
57 if (!labels_->Retrieve(serializedLabels, key))
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
58 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
59 // The labels were not already stored in the cache or they have expired
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
60 OrthancResource parent;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
61 UpdateResourceFromOrthanc(parent, labels, resource);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
62 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
63 else
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
64 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
65 Orthanc::Toolbox::SplitString(labels, serializedLabels, ',');
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
66 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
67 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
68
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
69
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
70 void ResourceHierarchyCache::UpdateResourceFromOrthanc(OrthancResource& parent,
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
71 std::set<std::string>& labels,
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
72 const OrthancResource& resource)
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
73 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
74 std::string key = ComputeKey(resource);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
75
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
76 // Not in the cache, reading the resource from the Orthanc store
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
77 std::string dicomUid;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
78 std::list<OrthancResource> children;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
79
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
80 if (!resource.GetHierarchy(dicomUid, parent, children, labels))
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
81 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
82 // The resource is non-existing (*)
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
83 return;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
84 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
85
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
86 orthancToDicom_->Store(key, dicomUid, 0 /* no expiration */);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
87 dicomToOrthanc_->Store(ComputeKey(resource.GetLevel(), dicomUid),
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
88 resource.GetIdentifier(), 0 /* no expiration */);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
89 std::string serializedLabels;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
90 Orthanc::Toolbox::JoinStrings(serializedLabels, labels, ",");
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
91 labels_->Store(key, serializedLabels, 60);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
92
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
93 for (std::list<OrthancResource>::const_iterator
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
94 it = children.begin(); it != children.end(); ++it)
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
95 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
96 // Cache the relation of the resource with its children
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
97 LinkParent(*it, resource);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
98 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
99
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
100 if (parent.IsValid())
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
101 {
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
102 LinkParent(resource, parent);
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
103 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
104 }
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
105
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 bool ResourceHierarchyCache::LookupParent(std::string& target,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 const OrthancResource& resource)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 std::string key = ComputeKey(resource);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 if (cache_->Retrieve(target, key))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 // The parent was already stored in the cache
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 OrthancResource parent;
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
119 std::set<std::string> labels;
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
120 UpdateResourceFromOrthanc(parent, labels, resource);
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 if (parent.IsValid())
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 target = parent.GetIdentifier();
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 else
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 // We reached the patient level, or the resource was removed
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 // from Orthanc since (*)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 return false;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
136 ResourceHierarchyCache::ResourceHierarchyCache(ICacheFactory& factory) :
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 cache_(factory.Create()),
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 orthancToDicom_(factory.Create()),
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
139 dicomToOrthanc_(factory.Create()),
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
140 labels_(factory.Create())
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 if (cache_.get() == NULL)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 void ResourceHierarchyCache::Invalidate(Orthanc::ResourceType level,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 const std::string& identifier)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152 LOG(INFO) << "Invalidating " << Orthanc::EnumerationToString(level)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 << " resource with ID: " << identifier;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 std::string key = ComputeKey(level, identifier);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 cache_->Invalidate(key);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 orthancToDicom_->Invalidate(key);
109
7381a7674b36 wip: adding labels
Alain Mazy <am@osimis.io>
parents: 78
diff changeset
158 labels_->Invalidate(key);
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 bool ResourceHierarchyCache::LookupSeries(std::string& patient,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 std::string& study,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 const std::string& series)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 if (LookupParent(study, Orthanc::ResourceType_Series, series))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 return LookupStudy(patient, study);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 else
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 return false;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 bool ResourceHierarchyCache::LookupInstance(std::string& patient,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 std::string& study,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 std::string& series,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 const std::string& instance)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 if (LookupParent(series, Orthanc::ResourceType_Instance, instance))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 return LookupSeries(patient, study, series);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 else
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 return false;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 bool ResourceHierarchyCache::LookupDicomUid(std::string& target,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 Orthanc::ResourceType level,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 const std::string& orthancId)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 std::string key = ComputeKey(level, orthancId);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 if (orthancToDicom_->Retrieve(target, key))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204 OrthancResource resource(level, orthancId);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
206 if (resource.GetDicomUid(target))
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 orthancToDicom_->Store(key, target, 0 /* no expiration */);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 else
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213 return false;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
215 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
216
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
217
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
218 bool ResourceHierarchyCache::LookupOrthancId(std::string& target,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
219 Orthanc::ResourceType level,
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
220 const std::string& dicomUid)
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 std::string key = ComputeKey(level, dicomUid);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 if (dicomToOrthanc_->Retrieve(target, key))
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
227 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228
29
bc0431cb6b8f fix for compatibility with simplified OrthancPluginCppWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
229 if (OrthancResource::LookupOrthancId(target, level, dicomUid))
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 dicomToOrthanc_->Store(key, target, 0 /* no expiration */);
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 return true;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 else
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 {
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
236 return false;
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
237 }
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238 }
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
239
78
a2e5ea1869bd fix build
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
240 #if BUILD_UNIT_TESTS == 1
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
241 void ResourceHierarchyCache::AddOrthancDicomMapping(Orthanc::ResourceType level,
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
242 const std::string& orthancId,
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
243 const std::string& dicomUid)
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
244 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
245 dicomToOrthanc_->Store(ComputeKey(level, dicomUid), orthancId, 0 /* no expiration */);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
246 orthancToDicom_->Store(ComputeKey(level, orthancId), dicomUid, 0 /* no expiration */);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
247 }
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
248
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
249 void ResourceHierarchyCache::AddParentLink(Orthanc::ResourceType childLevel,
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
250 const std::string& childOrthancId,
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
251 const std::string& parentOrthancId)
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
252 {
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
253 cache_->Store(ComputeKey(childLevel, childOrthancId), parentOrthancId, 0 /* no expiration */);
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
254 }
110
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
255
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
256 void ResourceHierarchyCache::AddLabels(Orthanc::ResourceType level,
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
257 const std::string& orthancId,
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
258 const std::string& serializedLabels)
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
259 {
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
260 labels_->Store(ComputeKey(level, orthancId), serializedLabels, 0 /* no expiration */);
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
261 }
aa56dcf599b9 fix unit tests
Alain Mazy <am@osimis.io>
parents: 109
diff changeset
262
78
a2e5ea1869bd fix build
Alain Mazy <am@osimis.io>
parents: 77
diff changeset
263 #endif
77
94a9484d7f8f fix security issues allowing to browse remote dicom servers + introduced UnitTests
Alain Mazy <am@osimis.io>
parents: 68
diff changeset
264
1
d5d3cb00556a initial release
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265 }