Mercurial > hg > orthanc
annotate OrthancServer/Sources/ResourceFinder.cpp @ 5854:65f8c6dfba50 find-refactoring
cleanup
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Mon, 04 Nov 2024 17:51:46 +0100 |
| parents | ea547160f27e |
| children | aeb9f63923b1 |
| rev | line source |
|---|---|
| 5608 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
5641
3f13db27b399
integration mainline->find-refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5621
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
3f13db27b399
integration mainline->find-refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5621
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
| 5608 | 7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 8 * | |
| 9 * This program is free software: you can redistribute it and/or | |
| 10 * modify it under the terms of the GNU General Public License as | |
| 11 * published by the Free Software Foundation, either version 3 of the | |
| 12 * License, or (at your option) any later version. | |
| 13 * | |
| 14 * This program is distributed in the hope that it will be useful, but | |
| 15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 * General Public License for more details. | |
| 18 * | |
| 19 * You should have received a copy of the GNU General Public License | |
| 20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 **/ | |
| 22 | |
| 23 | |
| 24 #include "PrecompiledHeadersServer.h" | |
| 25 #include "ResourceFinder.h" | |
| 26 | |
| 27 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h" | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
28 #include "../../OrthancFramework/Sources/Logging.h" |
| 5608 | 29 #include "../../OrthancFramework/Sources/OrthancException.h" |
| 30 #include "../../OrthancFramework/Sources/SerializationToolbox.h" | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
31 #include "OrthancConfiguration.h" |
|
5682
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
32 #include "Search/DatabaseLookup.h" |
| 5608 | 33 #include "ServerContext.h" |
| 34 #include "ServerIndex.h" | |
| 35 | |
| 36 | |
| 37 namespace Orthanc | |
| 38 { | |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
39 static bool IsComputedTag(const DicomTag& tag) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
40 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
41 return (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
42 tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
43 tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
44 tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
45 tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
46 tag == DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
47 tag == DICOM_TAG_SOP_CLASSES_IN_STUDY || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
48 tag == DICOM_TAG_MODALITIES_IN_STUDY || |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
49 tag == DICOM_TAG_INSTANCE_AVAILABILITY); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
50 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
51 |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
52 void ResourceFinder::ConfigureChildrenCountComputedTag(DicomTag tag, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
53 ResourceType parentLevel, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
54 ResourceType childLevel) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
55 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
56 if (request_.GetLevel() == parentLevel) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
57 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
58 requestedComputedTags_.insert(tag); |
|
5676
b744a2cf408a
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5674
diff
changeset
|
59 request_.GetChildrenSpecification(childLevel).SetRetrieveIdentifiers(true); |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
60 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
61 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
62 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
63 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
64 void ResourceFinder::InjectChildrenCountComputedTag(DicomMap& requestedTags, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
65 DicomTag tag, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
66 const FindResponse::Resource& resource, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
67 ResourceType level) const |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
68 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
69 if (IsRequestedComputedTag(tag)) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
70 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
71 const std::set<std::string>& children = resource.GetChildrenIdentifiers(level); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
72 requestedTags.SetValue(tag, boost::lexical_cast<std::string>(children.size()), false); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
73 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
74 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
75 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
76 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
77 void ResourceFinder::InjectComputedTags(DicomMap& requestedTags, |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
78 const FindResponse::Resource& resource) const |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
79 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
80 switch (resource.GetLevel()) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
81 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
82 case ResourceType_Patient: |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
83 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES, resource, ResourceType_Study); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
84 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES, resource, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
85 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES, resource, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
86 break; |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
87 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
88 case ResourceType_Study: |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
89 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES, resource, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
90 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES, resource, ResourceType_Instance); |
|
5672
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
91 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
92 if (IsRequestedComputedTag(DICOM_TAG_MODALITIES_IN_STUDY)) |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
93 { |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
94 std::set<std::string> modalities; |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
95 resource.GetChildrenMainDicomTagValues(modalities, ResourceType_Series, DICOM_TAG_MODALITY); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
96 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
97 std::string s; |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
98 Toolbox::JoinStrings(s, modalities, "\\"); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
99 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
100 requestedTags.SetValue(DICOM_TAG_MODALITIES_IN_STUDY, s, false); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
101 } |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
102 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
103 if (IsRequestedComputedTag(DICOM_TAG_SOP_CLASSES_IN_STUDY)) |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
104 { |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
105 std::set<std::string> classes; |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
106 resource.GetChildrenMetadataValues(classes, ResourceType_Instance, MetadataType_Instance_SopClassUid); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
107 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
108 std::string s; |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
109 Toolbox::JoinStrings(s, classes, "\\"); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
110 |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
111 requestedTags.SetValue(DICOM_TAG_SOP_CLASSES_IN_STUDY, s, false); |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
112 } |
|
e300f22a46f0
implemented computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5668
diff
changeset
|
113 |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
114 break; |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
115 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
116 case ResourceType_Series: |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
117 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES, resource, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
118 break; |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
119 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
120 case ResourceType_Instance: |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
121 if (IsRequestedComputedTag(DICOM_TAG_INSTANCE_AVAILABILITY)) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
122 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
123 requestedTags.SetValue(DICOM_TAG_INSTANCE_AVAILABILITY, "ONLINE", false); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
124 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
125 break; |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
126 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
127 default: |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
128 throw OrthancException(ErrorCode_InternalError); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
129 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
130 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
131 |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
132 |
| 5608 | 133 SeriesStatus ResourceFinder::GetSeriesStatus(uint32_t& expectedNumberOfInstances, |
| 5689 | 134 const FindResponse::Resource& resource) |
| 5608 | 135 { |
| 5689 | 136 if (resource.GetLevel() != ResourceType_Series) |
| 5608 | 137 { |
| 138 throw OrthancException(ErrorCode_BadParameterType); | |
| 139 } | |
| 140 | |
| 141 std::string s; | |
| 142 if (!resource.LookupMetadata(s, ResourceType_Series, MetadataType_Series_ExpectedNumberOfInstances) || | |
| 143 !SerializationToolbox::ParseUnsignedInteger32(expectedNumberOfInstances, s)) | |
| 144 { | |
| 145 return SeriesStatus_Unknown; | |
| 146 } | |
| 147 | |
| 5674 | 148 std::set<std::string> values; |
| 149 resource.GetChildrenMetadataValues(values, ResourceType_Instance, MetadataType_Instance_IndexInSeries); | |
| 5608 | 150 |
| 151 std::set<int64_t> instances; | |
| 152 | |
| 5674 | 153 for (std::set<std::string>::const_iterator |
| 5608 | 154 it = values.begin(); it != values.end(); ++it) |
| 155 { | |
| 156 int64_t index; | |
| 157 | |
| 158 if (!SerializationToolbox::ParseInteger64(index, *it)) | |
| 159 { | |
| 160 return SeriesStatus_Unknown; | |
| 161 } | |
| 162 | |
| 163 if (index <= 0 || | |
| 164 index > static_cast<int64_t>(expectedNumberOfInstances)) | |
| 165 { | |
| 166 // Out-of-range instance index | |
| 167 return SeriesStatus_Inconsistent; | |
| 168 } | |
| 169 | |
| 170 if (instances.find(index) != instances.end()) | |
| 171 { | |
| 172 // Twice the same instance index | |
| 173 return SeriesStatus_Inconsistent; | |
| 174 } | |
| 175 | |
| 176 instances.insert(index); | |
| 177 } | |
| 178 | |
| 179 if (instances.size() == static_cast<size_t>(expectedNumberOfInstances)) | |
| 180 { | |
| 181 return SeriesStatus_Complete; | |
| 182 } | |
| 183 else | |
| 184 { | |
| 185 return SeriesStatus_Missing; | |
| 186 } | |
| 187 } | |
| 188 | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
189 static void GetMainDicomSequencesFromMetadata(DicomMap& target, const FindResponse::Resource& resource, ResourceType level) |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
190 { |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
191 // read all main sequences from DB |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
192 std::string serializedSequences; |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
193 if (resource.LookupMetadata(serializedSequences, level, MetadataType_MainDicomSequences)) |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
194 { |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
195 Json::Value jsonMetadata; |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
196 Toolbox::ReadJson(jsonMetadata, serializedSequences); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
197 |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
198 if (jsonMetadata["Version"].asInt() == 1) |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
199 { |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
200 target.FromDicomAsJson(jsonMetadata["Sequences"], true /* append */, true /* parseSequences */); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
201 } |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
202 else |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
203 { |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
204 throw OrthancException(ErrorCode_NotImplemented); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
205 } |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
206 } |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
207 } |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
208 |
| 5608 | 209 |
| 210 void ResourceFinder::Expand(Json::Value& target, | |
| 211 const FindResponse::Resource& resource, | |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
212 ServerIndex& index, |
| 5829 | 213 DicomToJsonFormat format) const |
| 5608 | 214 { |
| 215 /** | |
| 216 * This method closely follows "SerializeExpandedResource()" in | |
| 5689 | 217 * "ServerContext.cpp" from Orthanc 1.12.4. |
| 5608 | 218 **/ |
| 219 | |
| 5829 | 220 if (responseContent_ == ResponseContentFlags_ID) |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
221 { |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
222 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
223 } |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
224 |
| 5608 | 225 if (resource.GetLevel() != request_.GetLevel()) |
| 226 { | |
| 227 throw OrthancException(ErrorCode_InternalError); | |
| 228 } | |
| 229 | |
| 230 target = Json::objectValue; | |
| 231 | |
| 232 target["Type"] = GetResourceTypeText(resource.GetLevel(), false, true); | |
| 233 target["ID"] = resource.GetIdentifier(); | |
| 234 | |
| 5829 | 235 if (responseContent_ & ResponseContentFlags_Parent) |
| 5608 | 236 { |
| 5829 | 237 switch (resource.GetLevel()) |
| 238 { | |
| 239 case ResourceType_Patient: | |
| 240 break; | |
| 5608 | 241 |
| 5829 | 242 case ResourceType_Study: |
| 243 target["ParentPatient"] = resource.GetParentIdentifier(); | |
| 244 break; | |
| 5608 | 245 |
| 5829 | 246 case ResourceType_Series: |
| 247 target["ParentStudy"] = resource.GetParentIdentifier(); | |
| 248 break; | |
| 5608 | 249 |
| 5829 | 250 case ResourceType_Instance: |
| 251 target["ParentSeries"] = resource.GetParentIdentifier(); | |
| 252 break; | |
| 5608 | 253 |
| 5829 | 254 default: |
| 255 throw OrthancException(ErrorCode_InternalError); | |
| 256 } | |
| 5608 | 257 } |
| 258 | |
| 5829 | 259 if ((responseContent_ & ResponseContentFlags_Children) && (resource.GetLevel() != ResourceType_Instance)) |
| 5608 | 260 { |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
261 const std::set<std::string>& children = resource.GetChildrenIdentifiers(GetChildResourceType(resource.GetLevel())); |
| 5608 | 262 |
| 263 Json::Value c = Json::arrayValue; | |
| 264 for (std::set<std::string>::const_iterator | |
| 265 it = children.begin(); it != children.end(); ++it) | |
| 266 { | |
| 267 c.append(*it); | |
| 268 } | |
| 269 | |
| 270 switch (resource.GetLevel()) | |
| 271 { | |
| 272 case ResourceType_Patient: | |
| 273 target["Studies"] = c; | |
| 274 break; | |
| 275 | |
| 276 case ResourceType_Study: | |
| 277 target["Series"] = c; | |
| 278 break; | |
| 279 | |
| 280 case ResourceType_Series: | |
| 281 target["Instances"] = c; | |
| 282 break; | |
| 283 | |
| 284 default: | |
| 285 throw OrthancException(ErrorCode_InternalError); | |
| 286 } | |
| 287 } | |
| 288 | |
| 289 switch (resource.GetLevel()) | |
| 290 { | |
| 291 case ResourceType_Patient: | |
| 292 case ResourceType_Study: | |
| 293 break; | |
| 294 | |
| 295 case ResourceType_Series: | |
| 296 { | |
| 5829 | 297 if ((responseContent_ & ResponseContentFlags_Status) || (responseContent_ & ResponseContentFlags_MetadataLegacy) ) |
| 298 { | |
| 299 uint32_t expectedNumberOfInstances; | |
| 300 SeriesStatus status = GetSeriesStatus(expectedNumberOfInstances, resource); | |
| 301 | |
| 302 if (responseContent_ & ResponseContentFlags_Status ) | |
| 303 { | |
| 304 target["Status"] = EnumerationToString(status); | |
| 305 } | |
| 5608 | 306 |
| 5829 | 307 if (responseContent_ & ResponseContentFlags_MetadataLegacy) |
| 308 { | |
| 309 static const char* const EXPECTED_NUMBER_OF_INSTANCES = "ExpectedNumberOfInstances"; | |
| 310 | |
| 311 if (status == SeriesStatus_Unknown) | |
| 312 { | |
| 313 target[EXPECTED_NUMBER_OF_INSTANCES] = Json::nullValue; | |
| 314 } | |
| 315 else | |
| 316 { | |
| 317 target[EXPECTED_NUMBER_OF_INSTANCES] = expectedNumberOfInstances; | |
| 318 } | |
| 319 } | |
| 5608 | 320 } |
| 321 break; | |
| 322 } | |
| 323 | |
| 324 case ResourceType_Instance: | |
| 325 { | |
| 5829 | 326 if (responseContent_ & ResponseContentFlags_AttachmentsLegacy) |
| 5608 | 327 { |
| 5829 | 328 FileInfo info; |
|
5852
ea547160f27e
StatelessDatabaseOperations: reimplementing LookupAttachment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5840
diff
changeset
|
329 int64_t revision; |
|
ea547160f27e
StatelessDatabaseOperations: reimplementing LookupAttachment()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5840
diff
changeset
|
330 if (resource.LookupAttachment(info, revision, FileContentType_Dicom)) |
| 5829 | 331 { |
| 332 target["FileSize"] = static_cast<Json::UInt64>(info.GetUncompressedSize()); | |
| 333 target["FileUuid"] = info.GetUuid(); | |
| 334 } | |
| 335 else | |
| 336 { | |
| 337 throw OrthancException(ErrorCode_InternalError); | |
| 338 } | |
| 5608 | 339 } |
| 340 | |
| 5829 | 341 if (responseContent_ & ResponseContentFlags_MetadataLegacy) |
| 5608 | 342 { |
| 5829 | 343 static const char* const INDEX_IN_SERIES = "IndexInSeries"; |
| 344 | |
| 345 std::string s; | |
| 346 uint32_t indexInSeries; | |
| 347 if (resource.LookupMetadata(s, ResourceType_Instance, MetadataType_Instance_IndexInSeries) && | |
| 348 SerializationToolbox::ParseUnsignedInteger32(indexInSeries, s)) | |
| 349 { | |
| 350 target[INDEX_IN_SERIES] = indexInSeries; | |
| 351 } | |
| 352 else | |
| 353 { | |
| 354 target[INDEX_IN_SERIES] = Json::nullValue; | |
| 355 } | |
| 5608 | 356 } |
| 357 break; | |
| 358 } | |
| 359 | |
| 360 default: | |
| 361 throw OrthancException(ErrorCode_InternalError); | |
| 362 } | |
| 363 | |
| 364 std::string s; | |
| 5829 | 365 if (responseContent_ & ResponseContentFlags_MetadataLegacy) |
| 5608 | 366 { |
| 5829 | 367 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_AnonymizedFrom)) |
| 368 { | |
| 369 target["AnonymizedFrom"] = s; | |
| 370 } | |
| 5608 | 371 |
| 5829 | 372 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_ModifiedFrom)) |
| 373 { | |
| 374 target["ModifiedFrom"] = s; | |
| 375 } | |
| 5608 | 376 |
| 5829 | 377 if (resource.GetLevel() == ResourceType_Patient || |
| 378 resource.GetLevel() == ResourceType_Study || | |
| 379 resource.GetLevel() == ResourceType_Series) | |
| 5608 | 380 { |
| 5829 | 381 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_LastUpdate)) |
| 382 { | |
| 383 target["LastUpdate"] = s; | |
| 384 } | |
| 5608 | 385 } |
| 386 } | |
| 387 | |
| 5829 | 388 if (responseContent_ & ResponseContentFlags_IsStable) |
| 389 { | |
| 390 if (resource.GetLevel() == ResourceType_Patient || | |
| 391 resource.GetLevel() == ResourceType_Study || | |
| 392 resource.GetLevel() == ResourceType_Series) | |
| 393 { | |
| 394 target["IsStable"] = !index.IsUnstableResource(resource.GetLevel(), resource.GetInternalId()); | |
| 395 } | |
| 396 } | |
| 397 | |
| 398 if (responseContent_ & ResponseContentFlags_MainDicomTags) | |
| 5608 | 399 { |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
400 DicomMap allMainDicomTags; |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
401 resource.GetMainDicomTags(allMainDicomTags, resource.GetLevel()); |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
402 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
403 // read all main sequences from DB |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
404 GetMainDicomSequencesFromMetadata(allMainDicomTags, resource, resource.GetLevel()); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
405 |
| 5608 | 406 static const char* const MAIN_DICOM_TAGS = "MainDicomTags"; |
| 407 static const char* const PATIENT_MAIN_DICOM_TAGS = "PatientMainDicomTags"; | |
| 408 | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
409 // TODO-FIND : Ignore "null" values |
| 5608 | 410 |
| 411 DicomMap levelMainDicomTags; | |
| 412 allMainDicomTags.ExtractResourceInformation(levelMainDicomTags, resource.GetLevel()); | |
| 413 | |
| 414 target[MAIN_DICOM_TAGS] = Json::objectValue; | |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
415 FromDcmtkBridge::ToJson(target[MAIN_DICOM_TAGS], levelMainDicomTags, format); |
| 5608 | 416 |
| 417 if (resource.GetLevel() == ResourceType_Study) | |
| 418 { | |
| 419 DicomMap patientMainDicomTags; | |
| 420 allMainDicomTags.ExtractPatientInformation(patientMainDicomTags); | |
| 421 | |
| 422 target[PATIENT_MAIN_DICOM_TAGS] = Json::objectValue; | |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
423 FromDcmtkBridge::ToJson(target[PATIENT_MAIN_DICOM_TAGS], patientMainDicomTags, format); |
| 5608 | 424 } |
| 425 } | |
| 426 | |
| 5829 | 427 if (responseContent_ & ResponseContentFlags_Labels) |
| 5608 | 428 { |
| 429 Json::Value labels = Json::arrayValue; | |
| 430 | |
| 431 for (std::set<std::string>::const_iterator | |
| 432 it = resource.GetLabels().begin(); it != resource.GetLabels().end(); ++it) | |
| 433 { | |
| 434 labels.append(*it); | |
| 435 } | |
| 436 | |
| 437 target["Labels"] = labels; | |
| 438 } | |
| 439 | |
| 5829 | 440 if (responseContent_ & ResponseContentFlags_Metadata) // new in Orthanc 1.12.4 |
| 5608 | 441 { |
| 442 const std::map<MetadataType, std::string>& m = resource.GetMetadata(resource.GetLevel()); | |
| 443 | |
| 444 Json::Value metadata = Json::objectValue; | |
| 445 | |
| 446 for (std::map<MetadataType, std::string>::const_iterator it = m.begin(); it != m.end(); ++it) | |
| 447 { | |
| 448 metadata[EnumerationToString(it->first)] = it->second; | |
| 449 } | |
| 450 | |
| 451 target["Metadata"] = metadata; | |
| 452 } | |
| 5829 | 453 |
| 454 if (responseContent_ & ResponseContentFlags_Attachments) // new in Orthanc 1.12.5 | |
| 455 { | |
| 456 const std::map<FileContentType, FileInfo>& attachments = resource.GetAttachments(); | |
| 457 | |
| 458 target["Attachments"] = Json::arrayValue; | |
| 459 | |
| 460 for (std::map<FileContentType, FileInfo>::const_iterator it = attachments.begin(); it != attachments.end(); ++it) | |
| 461 { | |
| 462 Json::Value attachment = Json::objectValue; | |
| 463 attachment["Uuid"] = it->second.GetUuid(); | |
| 464 attachment["ContentType"] = it->second.GetContentType(); | |
| 465 attachment["UncompressedSize"] = Json::Value::UInt64(it->second.GetUncompressedSize()); | |
| 466 attachment["CompressedSize"] = Json::Value::UInt64(it->second.GetCompressedSize()); | |
| 467 attachment["UncompressedMD5"] = it->second.GetUncompressedMD5(); | |
| 468 attachment["CompressedMD5"] = it->second.GetCompressedMD5(); | |
| 469 | |
| 470 target["Attachments"].append(attachment); | |
| 471 } | |
| 472 } | |
| 5608 | 473 } |
| 474 | |
| 475 | |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
476 void ResourceFinder::UpdateRequestLimits(ServerContext& context) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
477 { |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
478 if (context.GetIndex().HasFindSupport()) // in this case, limits are fully implemented in DB |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
479 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
480 pagingMode_ = PagingMode_FullDatabase; |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
481 |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
482 if (hasLimitsSince_ || hasLimitsCount_) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
483 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
484 pagingMode_ = PagingMode_FullDatabase; |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
485 if (databaseLimits_ != 0 && limitsCount_ > databaseLimits_) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
486 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
487 LOG(WARNING) << "ResourceFinder: 'Limit' is larger than LimitFindResults/LimitFindInstances configurations, using limit fron the configuration file"; |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
488 limitsCount_ = databaseLimits_; |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
489 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
490 |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
491 request_.SetLimits(limitsSince_, limitsCount_); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
492 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
493 else if (databaseLimits_ != 0) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
494 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
495 request_.SetLimits(0, databaseLimits_); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
496 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
497 |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
498 } |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
499 else |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
500 { |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
501 // By default, use manual paging |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
502 pagingMode_ = PagingMode_FullManual; |
| 5693 | 503 |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
504 if (databaseLimits_ != 0) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
505 { |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
506 request_.SetLimits(0, databaseLimits_ + 1); |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
507 } |
| 5693 | 508 else |
| 509 { | |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
510 request_.ClearLimits(); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
511 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
512 |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
513 if (lookup_.get() == NULL && |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
514 (hasLimitsSince_ || hasLimitsCount_)) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
515 { |
| 5693 | 516 pagingMode_ = PagingMode_FullDatabase; |
|
5835
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
517 request_.SetLimits(limitsSince_, limitsCount_); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
518 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
519 |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
520 if (lookup_.get() != NULL && |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
521 isSimpleLookup_ && |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
522 (hasLimitsSince_ || hasLimitsCount_)) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
523 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
524 /** |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
525 * TODO-FIND: "IDatabaseWrapper::ApplyLookupResources()" only |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
526 * accept the "limit" argument. The "since" must be implemented |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
527 * manually. |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
528 **/ |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
529 |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
530 if (hasLimitsSince_ && |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
531 limitsSince_ != 0) |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
532 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
533 pagingMode_ = PagingMode_ManualSkip; |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
534 request_.SetLimits(0, limitsCount_ + limitsSince_); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
535 } |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
536 else |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
537 { |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
538 pagingMode_ = PagingMode_FullDatabase; |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
539 request_.SetLimits(0, limitsCount_); |
|
7c61bdf925fc
simplified limit handling + Limit argument is now clipped by LimitFindResults
Alain Mazy <am@orthanc.team>
parents:
5829
diff
changeset
|
540 } |
| 5693 | 541 } |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
542 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
543 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
544 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
545 |
| 5608 | 546 ResourceFinder::ResourceFinder(ResourceType level, |
| 5829 | 547 ResponseContentFlags responseContent) : |
| 5608 | 548 request_(level), |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
549 databaseLimits_(0), |
| 5693 | 550 isSimpleLookup_(true), |
| 551 pagingMode_(PagingMode_FullManual), | |
| 552 hasLimitsSince_(false), | |
| 553 hasLimitsCount_(false), | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
554 limitsSince_(0), |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
555 limitsCount_(0), |
| 5829 | 556 responseContent_(responseContent), |
|
5617
8905ffa45fc2
started listing of children resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5616
diff
changeset
|
557 allowStorageAccess_(true), |
| 5789 | 558 isWarning002Enabled_(false), |
| 559 isWarning004Enabled_(false), | |
| 560 isWarning005Enabled_(false) | |
| 5608 | 561 { |
| 5789 | 562 { |
| 563 OrthancConfiguration::ReaderLock lock; | |
| 564 isWarning002Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_002_InconsistentDicomTagsInDb); | |
| 565 isWarning004Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_004_NoMainDicomTagsSignature); | |
| 566 isWarning005Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_005_RequestingTagFromLowerResourceLevel); | |
| 567 } | |
| 568 | |
| 5829 | 569 request_.SetRetrieveMainDicomTags(responseContent_ & ResponseContentFlags_MainDicomTags); |
| 570 request_.SetRetrieveMetadata((responseContent_ & ResponseContentFlags_Metadata) || (responseContent_ & ResponseContentFlags_MetadataLegacy)); | |
| 571 request_.SetRetrieveLabels(responseContent_ & ResponseContentFlags_Labels); | |
| 5608 | 572 |
| 5829 | 573 switch (level) |
| 574 { | |
| 575 case ResourceType_Patient: | |
| 576 request_.GetChildrenSpecification(ResourceType_Study).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 577 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 578 break; | |
| 579 | |
| 580 case ResourceType_Study: | |
| 581 request_.GetChildrenSpecification(ResourceType_Series).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 582 request_.SetRetrieveParentIdentifier(responseContent_ & ResponseContentFlags_Parent); | |
| 583 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 584 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
585 |
| 5829 | 586 case ResourceType_Series: |
| 587 if (responseContent_ & ResponseContentFlags_Status) | |
| 588 { | |
|
5676
b744a2cf408a
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5674
diff
changeset
|
589 request_.GetChildrenSpecification(ResourceType_Instance).AddMetadata(MetadataType_Instance_IndexInSeries); // required for the SeriesStatus |
| 5829 | 590 } |
| 591 request_.GetChildrenSpecification(ResourceType_Instance).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 592 request_.SetRetrieveParentIdentifier(responseContent_ & ResponseContentFlags_Parent); | |
| 593 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 594 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
595 |
| 5829 | 596 case ResourceType_Instance: |
| 597 request_.SetRetrieveAttachments((responseContent_ & ResponseContentFlags_AttachmentsLegacy) // for FileSize & FileUuid | |
| 598 || (responseContent_ & ResponseContentFlags_Attachments)); | |
| 599 request_.SetRetrieveParentIdentifier(true); | |
| 600 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
601 |
| 5829 | 602 default: |
| 603 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 5608 | 604 } |
| 605 } | |
| 606 | |
| 607 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
608 void ResourceFinder::SetDatabaseLimits(uint64_t limits) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
609 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
610 databaseLimits_ = limits; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
611 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
612 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
613 |
| 5693 | 614 void ResourceFinder::SetLimitsSince(uint64_t since) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
615 { |
| 5693 | 616 if (hasLimitsSince_) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
617 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
618 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
619 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
620 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
621 { |
| 5693 | 622 hasLimitsSince_ = true; |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
623 limitsSince_ = since; |
| 5693 | 624 } |
| 625 } | |
| 626 | |
| 627 | |
| 628 void ResourceFinder::SetLimitsCount(uint64_t count) | |
| 629 { | |
| 630 if (hasLimitsCount_) | |
| 631 { | |
| 632 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 633 } | |
| 634 else | |
| 635 { | |
| 636 hasLimitsCount_ = true; | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
637 limitsCount_ = count; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
638 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
639 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
640 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
641 |
|
5682
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
642 void ResourceFinder::SetDatabaseLookup(const DatabaseLookup& lookup) |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
643 { |
| 5694 | 644 MainDicomTagsRegistry registry; |
| 645 | |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
646 lookup_.reset(lookup.Clone()); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
647 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
648 for (size_t i = 0; i < lookup.GetConstraintsCount(); i++) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
649 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
650 DicomTag tag = lookup.GetConstraint(i).GetTag(); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
651 if (IsComputedTag(tag)) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
652 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
653 AddRequestedTag(tag); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
654 } |
| 5694 | 655 else |
| 656 { | |
| 657 ResourceType level; | |
| 658 DicomTagType tagType; | |
| 659 registry.LookupTag(level, tagType, tag); | |
| 660 if (tagType == DicomTagType_Generic) | |
| 661 { | |
| 662 AddRequestedTag(tag); | |
| 663 } | |
| 664 } | |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
665 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
666 |
| 5693 | 667 isSimpleLookup_ = registry.NormalizeLookup(request_.GetDicomTagConstraints(), lookup, request_.GetLevel()); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
668 |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
669 // "request_.GetDicomTagConstraints()" only contains constraints on main DICOM tags |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
670 |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
671 for (size_t i = 0; i < request_.GetDicomTagConstraints().GetSize(); i++) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
672 { |
| 5828 | 673 const DatabaseDicomTagConstraint& constraint = request_.GetDicomTagConstraints().GetConstraint(i); |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
674 if (constraint.GetLevel() == request_.GetLevel()) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
675 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
676 request_.SetRetrieveMainDicomTags(true); |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
677 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
678 else if (IsResourceLevelAboveOrEqual(constraint.GetLevel(), request_.GetLevel())) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
679 { |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
680 request_.GetParentSpecification(constraint.GetLevel()).SetRetrieveMainDicomTags(true); |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
681 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
682 else |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
683 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
684 LOG(WARNING) << "Executing a database lookup at level " << EnumerationToString(request_.GetLevel()) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
685 << " on main DICOM tag " << constraint.GetTag().Format() << " from an inferior level (" |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
686 << EnumerationToString(constraint.GetLevel()) << "), this will return no result"; |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
687 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
688 |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
689 if (IsComputedTag(constraint.GetTag())) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
690 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
691 // Sanity check |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
692 throw OrthancException(ErrorCode_InternalError); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
693 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
694 } |
|
5682
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
695 } |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
696 |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
697 |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
698 void ResourceFinder::AddRequestedTag(const DicomTag& tag) |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
699 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
700 requestedTags_.insert(tag); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
701 |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
702 if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
703 { |
|
5620
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
704 if (request_.GetLevel() == ResourceType_Patient) |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
705 { |
| 5697 | 706 request_.SetRetrieveMainDicomTags(true); |
|
5620
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
707 } |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
708 else |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
709 { |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
710 /** |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
711 * This comes from the fact that patient-level tags are copied |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
712 * at the study level, as implemented by "ResourcesContent::AddResource()". |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
713 **/ |
| 5697 | 714 if (request_.GetLevel() == ResourceType_Study) |
| 715 { | |
| 716 request_.SetRetrieveMainDicomTags(true); | |
| 717 } | |
| 718 else | |
| 719 { | |
| 720 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
721 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 722 } |
|
5620
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
723 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
724 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
725 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Study)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
726 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
727 if (request_.GetLevel() == ResourceType_Patient) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
728 { |
| 5789 | 729 if (isWarning005Enabled_) |
| 730 { | |
| 731 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 732 << " should only be read at the study, series, or instance level"; | |
| 733 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
734 request_.SetRetrieveOneInstanceMetadataAndAttachments(true); // we might need to get it from one instance |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
735 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
736 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
737 { |
| 5697 | 738 if (request_.GetLevel() == ResourceType_Study) |
| 739 { | |
| 740 request_.SetRetrieveMainDicomTags(true); | |
| 741 } | |
| 742 else | |
| 743 { | |
| 744 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
745 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 746 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
747 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
748 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
749 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Series)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
750 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
751 if (request_.GetLevel() == ResourceType_Patient || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
752 request_.GetLevel() == ResourceType_Study) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
753 { |
| 5789 | 754 if (isWarning005Enabled_) |
| 755 { | |
| 756 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 757 << " should only be read at the series or instance level"; | |
| 758 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
759 request_.SetRetrieveOneInstanceMetadataAndAttachments(true); // we might need to get it from one instance |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
760 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
761 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
762 { |
| 5697 | 763 if (request_.GetLevel() == ResourceType_Series) |
| 764 { | |
| 765 request_.SetRetrieveMainDicomTags(true); | |
| 766 } | |
| 767 else | |
| 768 { | |
| 769 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
770 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 771 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
772 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
773 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
774 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Instance)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
775 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
776 if (request_.GetLevel() == ResourceType_Patient || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
777 request_.GetLevel() == ResourceType_Study || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
778 request_.GetLevel() == ResourceType_Series) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
779 { |
| 5789 | 780 if (isWarning005Enabled_) |
| 781 { | |
| 782 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 783 << " should only be read at the instance level"; | |
| 784 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
785 request_.SetRetrieveOneInstanceMetadataAndAttachments(true); // we might need to get it from one instance |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
786 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
787 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
788 { |
|
5699
e8e028aed89f
c-find tests pass using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5697
diff
changeset
|
789 request_.SetRetrieveMainDicomTags(true); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
790 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
791 } |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
792 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
793 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
794 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Study); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
795 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
796 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
797 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
798 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
799 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
800 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
801 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
802 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
803 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
804 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
805 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
806 ConfigureChildrenCountComputedTag(tag, ResourceType_Study, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
807 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
808 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
809 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
810 ConfigureChildrenCountComputedTag(tag, ResourceType_Study, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
811 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
812 else if (tag == DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
813 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
814 ConfigureChildrenCountComputedTag(tag, ResourceType_Series, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
815 } |
|
5668
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
816 else if (tag == DICOM_TAG_SOP_CLASSES_IN_STUDY) |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
817 { |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
818 requestedComputedTags_.insert(tag); |
|
5676
b744a2cf408a
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5674
diff
changeset
|
819 request_.GetChildrenSpecification(ResourceType_Instance).AddMetadata(MetadataType_Instance_SopClassUid); |
|
5668
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
820 } |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
821 else if (tag == DICOM_TAG_MODALITIES_IN_STUDY) |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
822 { |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
823 requestedComputedTags_.insert(tag); |
|
5752
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
824 if (request_.GetLevel() < ResourceType_Series) |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
825 { |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
826 request_.GetChildrenSpecification(ResourceType_Series).AddMainDicomTag(DICOM_TAG_MODALITY); |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
827 } |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
828 else if (request_.GetLevel() == ResourceType_Instance) // this happens in QIDO-RS when searching for instances without specifying a StudyInstanceUID -> all Study level tags must be included in the response |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
829 { |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
830 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true); |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
831 } |
|
5668
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
832 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
833 else if (tag == DICOM_TAG_INSTANCE_AVAILABILITY) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
834 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
835 requestedComputedTags_.insert(tag); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
836 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
837 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
838 { |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
839 // This is neither a main DICOM tag, nor a computed DICOM tag: |
| 5789 | 840 // We might need to access a DICOM file or the MainDicomSequences metadata |
| 841 | |
| 842 request_.SetRetrieveMetadata(true); | |
| 843 | |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
844 if (request_.GetLevel() != ResourceType_Instance) |
|
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
845 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
846 request_.SetRetrieveOneInstanceMetadataAndAttachments(true); |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
847 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
848 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
849 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
850 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
851 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
852 void ResourceFinder::AddRequestedTags(const std::set<DicomTag>& tags) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
853 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
854 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
855 { |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
856 AddRequestedTag(*it); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
857 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
858 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
859 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
860 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
861 static void InjectRequestedTags(DicomMap& target, |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
862 std::set<DicomTag>& remainingRequestedTags /* in & out */, |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
863 const FindResponse::Resource& resource, |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
864 ResourceType level/*, |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
865 const std::set<DicomTag>& tags*/) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
866 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
867 if (!remainingRequestedTags.empty() && level <= resource.GetLevel()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
868 { |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
869 std::set<DicomTag> savedMainDicomTags; |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
870 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
871 DicomMap m; |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
872 resource.GetMainDicomTags(m, level); // read DicomTags from DB |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
873 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
874 if (resource.GetMetadata(level).size() > 0) |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
875 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
876 GetMainDicomSequencesFromMetadata(m, resource, level); // read DicomSequences from metadata |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
877 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
878 // check which tags have been saved in DB; that's the way to know if they are missing because they were not saved or because they have no value |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
879 |
| 5795 | 880 std::string signature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(level); // default signature in case it's not in the metadata (= the signature for 1.11.0) |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
881 if (resource.LookupMetadata(signature, level, MetadataType_MainDicomTagsSignature)) |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
882 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
883 if (level == ResourceType_Study) // when we retrieve the study tags, we actually also get the patient tags that are also saved at study level but not included in the signature |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
884 { |
| 5795 | 885 signature += ";" + DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(ResourceType_Patient); // append the default signature (from before 1.11.0) |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
886 } |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
887 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
888 FromDcmtkBridge::ParseListOfTags(savedMainDicomTags, signature); |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
889 } |
|
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
890 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
891 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
892 std::set<DicomTag> copiedTags; |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
893 for (std::set<DicomTag>::const_iterator it = remainingRequestedTags.begin(); it != remainingRequestedTags.end(); ++it) |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
894 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
895 if (target.CopyTagIfExists(m, *it)) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
896 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
897 copiedTags.insert(*it); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
898 } |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
899 else if (savedMainDicomTags.find(*it) != savedMainDicomTags.end()) // the tag should have been saved in DB but has no value so we consider it has been copied |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
900 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
901 copiedTags.insert(*it); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
902 } |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
903 } |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
904 |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
905 Toolbox::RemoveSets(remainingRequestedTags, copiedTags); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
906 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
907 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
908 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
909 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
910 static void ReadMissingTagsFromStorageArea(DicomMap& requestedTags, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
911 ServerContext& context, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
912 const FindRequest& request, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
913 const FindResponse::Resource& resource, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
914 const std::set<DicomTag>& missingTags) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
915 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
916 OrthancConfiguration::ReaderLock lock; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
917 if (lock.GetConfiguration().IsWarningEnabled(Warnings_001_TagsBeingReadFromStorage)) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
918 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
919 std::string missings; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
920 FromDcmtkBridge::FormatListOfTags(missings, missingTags); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
921 |
|
5699
e8e028aed89f
c-find tests pass using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5697
diff
changeset
|
922 LOG(WARNING) << "W001: Accessing DICOM tags from storage when accessing " |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
923 << Orthanc::GetResourceTypeText(resource.GetLevel(), false, false) |
| 5764 | 924 << " " << resource.GetIdentifier() |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
925 << ": " << missings; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
926 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
927 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
928 // TODO-FIND: What do we do if the DICOM has been removed since the request? |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
929 // Do we fail, or do we skip the resource? |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
930 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
931 Json::Value tmpDicomAsJson; |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
932 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
933 if (request.GetLevel() == ResourceType_Instance && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
934 request.IsRetrieveMetadata() && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
935 request.IsRetrieveAttachments()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
936 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
937 LOG(INFO) << "Will retrieve missing DICOM tags from instance: " << resource.GetIdentifier(); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
938 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
939 context.ReadDicomAsJson(tmpDicomAsJson, resource.GetIdentifier(), resource.GetMetadata(ResourceType_Instance), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
940 resource.GetAttachments(), missingTags /* ignoreTagLength */); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
941 } |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
942 else if (request.GetLevel() != ResourceType_Instance && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
943 request.IsRetrieveOneInstanceMetadataAndAttachments()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
944 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
945 LOG(INFO) << "Will retrieve missing DICOM tags from instance: " << resource.GetOneInstancePublicId(); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
946 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
947 context.ReadDicomAsJson(tmpDicomAsJson, resource.GetOneInstancePublicId(), resource.GetOneInstanceMetadata(), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
948 resource.GetOneInstanceAttachments(), missingTags /* ignoreTagLength */); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
949 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
950 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
951 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
952 // TODO-FIND: This fallback shouldn't be necessary |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
953 |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
954 FindRequest requestDicomAttachment(request.GetLevel()); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
955 requestDicomAttachment.SetOrthancId(request.GetLevel(), resource.GetIdentifier()); |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
956 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
957 if (request.GetLevel() == ResourceType_Instance) |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
958 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
959 requestDicomAttachment.SetRetrieveMetadata(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
960 requestDicomAttachment.SetRetrieveAttachments(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
961 } |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
962 else |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
963 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
964 requestDicomAttachment.SetRetrieveOneInstanceMetadataAndAttachments(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
965 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
966 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
967 FindResponse responseDicomAttachment; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
968 context.GetIndex().ExecuteFind(responseDicomAttachment, requestDicomAttachment); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
969 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
970 if (responseDicomAttachment.GetSize() != 1) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
971 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
972 throw OrthancException(ErrorCode_InexistentFile); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
973 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
974 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
975 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
976 const FindResponse::Resource& response = responseDicomAttachment.GetResourceByIndex(0); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
977 const std::string instancePublicId = response.GetIdentifier(); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
978 LOG(INFO) << "Will retrieve missing DICOM tags from instance: " << instancePublicId; |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
979 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
980 if (request.GetLevel() == ResourceType_Instance) |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
981 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
982 context.ReadDicomAsJson(tmpDicomAsJson, response.GetIdentifier(), response.GetMetadata(ResourceType_Instance), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
983 response.GetAttachments(), missingTags /* ignoreTagLength */); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
984 } |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
985 else |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
986 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
987 context.ReadDicomAsJson(tmpDicomAsJson, response.GetOneInstancePublicId(), response.GetOneInstanceMetadata(), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
988 response.GetOneInstanceAttachments(), missingTags /* ignoreTagLength */); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
989 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
990 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
991 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
992 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
993 DicomMap tmpDicomMap; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
994 tmpDicomMap.FromDicomAsJson(tmpDicomAsJson, false /* append */, true /* parseSequences*/); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
995 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
996 for (std::set<DicomTag>::const_iterator it = missingTags.begin(); it != missingTags.end(); ++it) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
997 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
998 assert(!requestedTags.HasTag(*it)); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
999 if (tmpDicomMap.HasTag(*it)) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1000 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1001 requestedTags.SetValue(*it, tmpDicomMap.GetValue(*it)); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1002 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1003 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1004 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1005 requestedTags.SetNullValue(*it); // TODO-FIND: Is this compatible with Orthanc <= 1.12.3? |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1006 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1007 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1008 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1009 |
| 5837 | 1010 uint64_t ResourceFinder::Count(ServerContext& context) const |
| 1011 { | |
| 1012 uint64_t count = 0; | |
| 1013 context.GetIndex().ExecuteCount(count, request_); | |
| 1014 return count; | |
| 1015 } | |
| 1016 | |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
1017 |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1018 void ResourceFinder::Execute(IVisitor& visitor, |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1019 ServerContext& context) |
| 5608 | 1020 { |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1021 UpdateRequestLimits(context); |
|
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1022 |
| 5764 | 1023 bool isWarning002Enabled = false; |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1024 bool isWarning004Enabled = false; |
| 5764 | 1025 |
| 1026 { | |
| 1027 OrthancConfiguration::ReaderLock lock; | |
| 1028 isWarning002Enabled = lock.GetConfiguration().IsWarningEnabled(Warnings_002_InconsistentDicomTagsInDb); | |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1029 isWarning004Enabled = lock.GetConfiguration().IsWarningEnabled(Warnings_004_NoMainDicomTagsSignature); |
| 5764 | 1030 } |
| 1031 | |
| 5608 | 1032 FindResponse response; |
| 1033 context.GetIndex().ExecuteFind(response, request_); | |
| 1034 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1035 bool complete; |
| 5693 | 1036 |
| 1037 switch (pagingMode_) | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1038 { |
| 5693 | 1039 case PagingMode_FullDatabase: |
| 1040 case PagingMode_ManualSkip: | |
| 1041 complete = true; | |
| 1042 break; | |
| 1043 | |
| 1044 case PagingMode_FullManual: | |
| 1045 complete = (databaseLimits_ == 0 || | |
| 1046 response.GetSize() <= databaseLimits_); | |
| 1047 break; | |
| 1048 | |
| 1049 default: | |
| 1050 throw OrthancException(ErrorCode_InternalError); | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1051 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1052 |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
1053 if (lookup_.get() != NULL) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1054 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1055 LOG(INFO) << "Number of candidate resources after fast DB filtering on main DICOM tags: " << response.GetSize(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1056 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1057 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1058 size_t countResults = 0; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1059 size_t skipped = 0; |
| 5608 | 1060 |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1061 for (size_t i = 0; i < response.GetSize(); i++) |
| 5608 | 1062 { |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1063 const FindResponse::Resource& resource = response.GetResourceByIndex(i); |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1064 |
|
5774
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1065 #if 0 |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1066 { |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1067 Json::Value v; |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1068 resource.DebugExport(v, request_); |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1069 std::cout << v.toStyledString(); |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1070 } |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1071 #endif |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1072 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1073 DicomMap outRequestedTags; |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1074 |
| 5789 | 1075 if (HasRequestedTags()) |
| 5608 | 1076 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1077 std::set<DicomTag> remainingRequestedTags = requestedTags_; // at this point, all requested tags are "missing" |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1078 |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1079 InjectComputedTags(outRequestedTags, resource); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1080 Toolbox::RemoveSets(remainingRequestedTags, requestedComputedTags_); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1081 |
| 5789 | 1082 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Patient); |
| 1083 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Study); | |
| 1084 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Series); | |
| 1085 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Instance); | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1086 |
|
5793
a8055aebc6cb
added standard MainDicomTags that are used in QIDO-RS
Alain Mazy <am@orthanc.team>
parents:
5790
diff
changeset
|
1087 if (!remainingRequestedTags.empty() && |
|
a8055aebc6cb
added standard MainDicomTags that are used in QIDO-RS
Alain Mazy <am@orthanc.team>
parents:
5790
diff
changeset
|
1088 !DicomMap::HasOnlyComputedTags(remainingRequestedTags)) // if the only remaining tags are computed tags, it is worthless to read them from disk |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1089 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1090 if (!allowStorageAccess_) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1091 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1092 throw OrthancException(ErrorCode_BadSequenceOfCalls, |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1093 "Cannot add missing requested tags, as access to file storage is disallowed"); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1094 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1095 else |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
1096 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1097 ReadMissingTagsFromStorageArea(outRequestedTags, context, request_, resource, remainingRequestedTags); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1098 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1099 } |
| 5764 | 1100 |
| 1101 std::string mainDicomTagsSignature; | |
| 1102 if (isWarning002Enabled && | |
| 1103 resource.LookupMetadata(mainDicomTagsSignature, resource.GetLevel(), MetadataType_MainDicomTagsSignature) && | |
| 1104 mainDicomTagsSignature != DicomMap::GetMainDicomTagsSignature(resource.GetLevel())) | |
| 1105 { | |
| 1106 LOG(WARNING) << "W002: " << Orthanc::GetResourceTypeText(resource.GetLevel(), false , false) | |
| 5789 | 1107 << " has been stored with another version of Main Dicom Tags list, you should POST to /" |
| 1108 << Orthanc::GetResourceTypeText(resource.GetLevel(), true, false) | |
| 1109 << "/" << resource.GetIdentifier() | |
| 1110 << "/reconstruct to update the list of tags saved in DB or run the Housekeeper plugin. Some MainDicomTags might be missing from this answer."; | |
| 5764 | 1111 } |
| 5789 | 1112 else if (isWarning004Enabled && |
| 1113 request_.IsRetrieveMetadata() && | |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1114 !resource.LookupMetadata(mainDicomTagsSignature, resource.GetLevel(), MetadataType_MainDicomTagsSignature)) |
|
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1115 { |
| 5789 | 1116 LOG(WARNING) << "W004: " << Orthanc::GetResourceTypeText(resource.GetLevel(), false , false) |
| 1117 << " has been stored with an old Orthanc version and does not have a MainDicomTagsSignature, you should POST to /" | |
| 1118 << Orthanc::GetResourceTypeText(resource.GetLevel(), true, false) | |
| 1119 << "/" << resource.GetIdentifier() | |
| 1120 << "/reconstruct to update the list of tags saved in DB or run the Housekeeper plugin. Some MainDicomTags might be missing from this answer."; | |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1121 } |
| 5764 | 1122 |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1123 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1124 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1125 bool match = true; |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1126 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1127 if (lookup_.get() != NULL) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1128 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1129 DicomMap tags; |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
1130 resource.GetAllMainDicomTags(tags); |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1131 tags.Merge(outRequestedTags); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1132 match = lookup_->IsMatch(tags); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1133 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1134 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1135 if (match) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1136 { |
| 5693 | 1137 if (pagingMode_ == PagingMode_FullDatabase) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1138 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1139 visitor.Apply(resource, outRequestedTags); |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1140 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1141 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1142 { |
| 5693 | 1143 if (hasLimitsSince_ && |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1144 skipped < limitsSince_) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1145 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1146 skipped++; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1147 } |
| 5693 | 1148 else if (hasLimitsCount_ && |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1149 countResults >= limitsCount_) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1150 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1151 // Too many results, don't mark as complete |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1152 complete = false; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1153 break; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1154 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1155 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1156 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1157 visitor.Apply(resource, outRequestedTags); |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1158 countResults++; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1159 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1160 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1161 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1162 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1163 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1164 if (complete) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1165 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1166 visitor.MarkAsComplete(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1167 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1168 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1169 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1170 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1171 void ResourceFinder::Execute(Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1172 ServerContext& context, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1173 DicomToJsonFormat format, |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1174 bool includeAllMetadata) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1175 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1176 class Visitor : public IVisitor |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1177 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1178 private: |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1179 const ResourceFinder& that_; |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1180 ServerIndex& index_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1181 Json::Value& target_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1182 DicomToJsonFormat format_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1183 bool hasRequestedTags_; |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1184 bool includeAllMetadata_; |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1185 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1186 public: |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1187 Visitor(const ResourceFinder& that, |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1188 ServerIndex& index, |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1189 Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1190 DicomToJsonFormat format, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1191 bool hasRequestedTags, |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1192 bool includeAllMetadata) : |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1193 that_(that), |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1194 index_(index), |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1195 target_(target), |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1196 format_(format), |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1197 hasRequestedTags_(hasRequestedTags), |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1198 includeAllMetadata_(includeAllMetadata) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1199 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1200 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1201 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1202 virtual void Apply(const FindResponse::Resource& resource, |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1203 const DicomMap& requestedTags) ORTHANC_OVERRIDE |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1204 { |
| 5829 | 1205 if (that_.responseContent_ != ResponseContentFlags_ID) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1206 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1207 Json::Value item; |
| 5829 | 1208 that_.Expand(item, resource, index_, format_); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1209 |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1210 if (hasRequestedTags_) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1211 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1212 static const char* const REQUESTED_TAGS = "RequestedTags"; |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1213 item[REQUESTED_TAGS] = Json::objectValue; |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1214 FromDcmtkBridge::ToJson(item[REQUESTED_TAGS], requestedTags, format_); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1215 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1216 |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1217 target_.append(item); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1218 } |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1219 else |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1220 { |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1221 target_.append(resource.GetIdentifier()); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1222 } |
| 5608 | 1223 } |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1224 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1225 virtual void MarkAsComplete() ORTHANC_OVERRIDE |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1226 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1227 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1228 }; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1229 |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1230 UpdateRequestLimits(context); |
|
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1231 |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1232 target = Json::arrayValue; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1233 |
| 5789 | 1234 Visitor visitor(*this, context.GetIndex(), target, format, HasRequestedTags(), includeAllMetadata); |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1235 Execute(visitor, context); |
| 5608 | 1236 } |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1237 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1238 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1239 bool ResourceFinder::ExecuteOneResource(Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1240 ServerContext& context, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1241 DicomToJsonFormat format, |
|
5840
b24b61331566
pagination: fixed compat with ODBC that does not support ExtendedFind
Alain Mazy <am@orthanc.team>
parents:
5837
diff
changeset
|
1242 bool includeAllMetadata) |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1243 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1244 Json::Value answer; |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1245 Execute(answer, context, format, includeAllMetadata); |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1246 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1247 if (answer.type() != Json::arrayValue) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1248 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1249 throw OrthancException(ErrorCode_InternalError); |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1250 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1251 else if (answer.size() > 1) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1252 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1253 throw OrthancException(ErrorCode_DatabasePlugin); |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1254 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1255 else if (answer.empty()) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1256 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1257 // Inexistent resource (or was deleted between the first and second phases) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1258 return false; |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1259 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1260 else |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1261 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1262 target = answer[0]; |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1263 return true; |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1264 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1265 } |
| 5608 | 1266 } |