Mercurial > hg > orthanc
annotate OrthancServer/Sources/ResourceFinder.cpp @ 5830:40f236ad829c find-refactoring
SQLite 3.46 + push NULL values at the end of the order by clauses
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Tue, 08 Oct 2024 17:05:18 +0200 |
| parents | 963945d780d6 |
| children |
| 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; |
| 329 if (resource.LookupAttachment(info, FileContentType_Dicom)) | |
| 330 { | |
| 331 target["FileSize"] = static_cast<Json::UInt64>(info.GetUncompressedSize()); | |
| 332 target["FileUuid"] = info.GetUuid(); | |
| 333 } | |
| 334 else | |
| 335 { | |
| 336 throw OrthancException(ErrorCode_InternalError); | |
| 337 } | |
| 5608 | 338 } |
| 339 | |
| 5829 | 340 if (responseContent_ & ResponseContentFlags_MetadataLegacy) |
| 5608 | 341 { |
| 5829 | 342 static const char* const INDEX_IN_SERIES = "IndexInSeries"; |
| 343 | |
| 344 std::string s; | |
| 345 uint32_t indexInSeries; | |
| 346 if (resource.LookupMetadata(s, ResourceType_Instance, MetadataType_Instance_IndexInSeries) && | |
| 347 SerializationToolbox::ParseUnsignedInteger32(indexInSeries, s)) | |
| 348 { | |
| 349 target[INDEX_IN_SERIES] = indexInSeries; | |
| 350 } | |
| 351 else | |
| 352 { | |
| 353 target[INDEX_IN_SERIES] = Json::nullValue; | |
| 354 } | |
| 5608 | 355 } |
| 356 break; | |
| 357 } | |
| 358 | |
| 359 default: | |
| 360 throw OrthancException(ErrorCode_InternalError); | |
| 361 } | |
| 362 | |
| 363 std::string s; | |
| 5829 | 364 if (responseContent_ & ResponseContentFlags_MetadataLegacy) |
| 5608 | 365 { |
| 5829 | 366 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_AnonymizedFrom)) |
| 367 { | |
| 368 target["AnonymizedFrom"] = s; | |
| 369 } | |
| 5608 | 370 |
| 5829 | 371 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_ModifiedFrom)) |
| 372 { | |
| 373 target["ModifiedFrom"] = s; | |
| 374 } | |
| 5608 | 375 |
| 5829 | 376 if (resource.GetLevel() == ResourceType_Patient || |
| 377 resource.GetLevel() == ResourceType_Study || | |
| 378 resource.GetLevel() == ResourceType_Series) | |
| 5608 | 379 { |
| 5829 | 380 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_LastUpdate)) |
| 381 { | |
| 382 target["LastUpdate"] = s; | |
| 383 } | |
| 5608 | 384 } |
| 385 } | |
| 386 | |
| 5829 | 387 if (responseContent_ & ResponseContentFlags_IsStable) |
| 388 { | |
| 389 if (resource.GetLevel() == ResourceType_Patient || | |
| 390 resource.GetLevel() == ResourceType_Study || | |
| 391 resource.GetLevel() == ResourceType_Series) | |
| 392 { | |
| 393 target["IsStable"] = !index.IsUnstableResource(resource.GetLevel(), resource.GetInternalId()); | |
| 394 } | |
| 395 } | |
| 396 | |
| 397 if (responseContent_ & ResponseContentFlags_MainDicomTags) | |
| 5608 | 398 { |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
399 DicomMap allMainDicomTags; |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
400 resource.GetMainDicomTags(allMainDicomTags, resource.GetLevel()); |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
401 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
402 // read all main sequences from DB |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
403 GetMainDicomSequencesFromMetadata(allMainDicomTags, resource, resource.GetLevel()); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
404 |
| 5608 | 405 static const char* const MAIN_DICOM_TAGS = "MainDicomTags"; |
| 406 static const char* const PATIENT_MAIN_DICOM_TAGS = "PatientMainDicomTags"; | |
| 407 | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
408 // TODO-FIND : Ignore "null" values |
| 5608 | 409 |
| 410 DicomMap levelMainDicomTags; | |
| 411 allMainDicomTags.ExtractResourceInformation(levelMainDicomTags, resource.GetLevel()); | |
| 412 | |
| 413 target[MAIN_DICOM_TAGS] = Json::objectValue; | |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
414 FromDcmtkBridge::ToJson(target[MAIN_DICOM_TAGS], levelMainDicomTags, format); |
| 5608 | 415 |
| 416 if (resource.GetLevel() == ResourceType_Study) | |
| 417 { | |
| 418 DicomMap patientMainDicomTags; | |
| 419 allMainDicomTags.ExtractPatientInformation(patientMainDicomTags); | |
| 420 | |
| 421 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
|
422 FromDcmtkBridge::ToJson(target[PATIENT_MAIN_DICOM_TAGS], patientMainDicomTags, format); |
| 5608 | 423 } |
| 424 } | |
| 425 | |
| 5829 | 426 if (responseContent_ & ResponseContentFlags_Labels) |
| 5608 | 427 { |
| 428 Json::Value labels = Json::arrayValue; | |
| 429 | |
| 430 for (std::set<std::string>::const_iterator | |
| 431 it = resource.GetLabels().begin(); it != resource.GetLabels().end(); ++it) | |
| 432 { | |
| 433 labels.append(*it); | |
| 434 } | |
| 435 | |
| 436 target["Labels"] = labels; | |
| 437 } | |
| 438 | |
| 5829 | 439 if (responseContent_ & ResponseContentFlags_Metadata) // new in Orthanc 1.12.4 |
| 5608 | 440 { |
| 441 const std::map<MetadataType, std::string>& m = resource.GetMetadata(resource.GetLevel()); | |
| 442 | |
| 443 Json::Value metadata = Json::objectValue; | |
| 444 | |
| 445 for (std::map<MetadataType, std::string>::const_iterator it = m.begin(); it != m.end(); ++it) | |
| 446 { | |
| 447 metadata[EnumerationToString(it->first)] = it->second; | |
| 448 } | |
| 449 | |
| 450 target["Metadata"] = metadata; | |
| 451 } | |
| 5829 | 452 |
| 453 if (responseContent_ & ResponseContentFlags_Attachments) // new in Orthanc 1.12.5 | |
| 454 { | |
| 455 const std::map<FileContentType, FileInfo>& attachments = resource.GetAttachments(); | |
| 456 | |
| 457 target["Attachments"] = Json::arrayValue; | |
| 458 | |
| 459 for (std::map<FileContentType, FileInfo>::const_iterator it = attachments.begin(); it != attachments.end(); ++it) | |
| 460 { | |
| 461 Json::Value attachment = Json::objectValue; | |
| 462 attachment["Uuid"] = it->second.GetUuid(); | |
| 463 attachment["ContentType"] = it->second.GetContentType(); | |
| 464 attachment["UncompressedSize"] = Json::Value::UInt64(it->second.GetUncompressedSize()); | |
| 465 attachment["CompressedSize"] = Json::Value::UInt64(it->second.GetCompressedSize()); | |
| 466 attachment["UncompressedMD5"] = it->second.GetUncompressedMD5(); | |
| 467 attachment["CompressedMD5"] = it->second.GetCompressedMD5(); | |
| 468 | |
| 469 target["Attachments"].append(attachment); | |
| 470 } | |
| 471 } | |
| 5608 | 472 } |
| 473 | |
| 474 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
475 void ResourceFinder::UpdateRequestLimits() |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
476 { |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
477 // By default, use manual paging |
| 5693 | 478 pagingMode_ = PagingMode_FullManual; |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
479 |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
480 if (databaseLimits_ != 0) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
481 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
482 request_.SetLimits(0, databaseLimits_ + 1); |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
483 } |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
484 else |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
485 { |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
486 request_.ClearLimits(); |
|
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
487 } |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
488 |
| 5693 | 489 if (lookup_.get() == NULL && |
| 490 (hasLimitsSince_ || hasLimitsCount_)) | |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
491 { |
| 5693 | 492 pagingMode_ = PagingMode_FullDatabase; |
| 493 request_.SetLimits(limitsSince_, limitsCount_); | |
| 494 } | |
| 495 | |
| 496 if (lookup_.get() != NULL && | |
| 497 isSimpleLookup_ && | |
| 498 (hasLimitsSince_ || hasLimitsCount_)) | |
| 499 { | |
| 500 /** | |
| 501 * TODO-FIND: "IDatabaseWrapper::ApplyLookupResources()" only | |
| 502 * accept the "limit" argument. The "since" must be implemented | |
| 503 * manually. | |
| 504 **/ | |
| 505 | |
| 506 if (hasLimitsSince_ && | |
| 507 limitsSince_ != 0) | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
508 { |
| 5693 | 509 pagingMode_ = PagingMode_ManualSkip; |
| 510 request_.SetLimits(0, limitsCount_ + limitsSince_); | |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
511 } |
| 5693 | 512 else |
| 513 { | |
| 514 pagingMode_ = PagingMode_FullDatabase; | |
| 515 request_.SetLimits(0, limitsCount_); | |
| 516 } | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
517 } |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
518 |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
519 // TODO-FIND: More cases could be added, depending on "GetDatabaseCapabilities()" |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
520 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
521 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
522 |
| 5608 | 523 ResourceFinder::ResourceFinder(ResourceType level, |
| 5829 | 524 ResponseContentFlags responseContent) : |
| 5608 | 525 request_(level), |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
526 databaseLimits_(0), |
| 5693 | 527 isSimpleLookup_(true), |
| 528 pagingMode_(PagingMode_FullManual), | |
| 529 hasLimitsSince_(false), | |
| 530 hasLimitsCount_(false), | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
531 limitsSince_(0), |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
532 limitsCount_(0), |
| 5829 | 533 responseContent_(responseContent), |
|
5617
8905ffa45fc2
started listing of children resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5616
diff
changeset
|
534 allowStorageAccess_(true), |
| 5789 | 535 isWarning002Enabled_(false), |
| 536 isWarning004Enabled_(false), | |
| 537 isWarning005Enabled_(false) | |
| 5608 | 538 { |
| 5789 | 539 { |
| 540 OrthancConfiguration::ReaderLock lock; | |
| 541 isWarning002Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_002_InconsistentDicomTagsInDb); | |
| 542 isWarning004Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_004_NoMainDicomTagsSignature); | |
| 543 isWarning005Enabled_ = lock.GetConfiguration().IsWarningEnabled(Warnings_005_RequestingTagFromLowerResourceLevel); | |
| 544 } | |
| 545 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
546 UpdateRequestLimits(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
547 |
| 5829 | 548 request_.SetRetrieveMainDicomTags(responseContent_ & ResponseContentFlags_MainDicomTags); |
| 549 request_.SetRetrieveMetadata((responseContent_ & ResponseContentFlags_Metadata) || (responseContent_ & ResponseContentFlags_MetadataLegacy)); | |
| 550 request_.SetRetrieveLabels(responseContent_ & ResponseContentFlags_Labels); | |
| 5608 | 551 |
| 5829 | 552 switch (level) |
| 553 { | |
| 554 case ResourceType_Patient: | |
| 555 request_.GetChildrenSpecification(ResourceType_Study).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 556 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 557 break; | |
| 558 | |
| 559 case ResourceType_Study: | |
| 560 request_.GetChildrenSpecification(ResourceType_Series).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 561 request_.SetRetrieveParentIdentifier(responseContent_ & ResponseContentFlags_Parent); | |
| 562 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 563 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
564 |
| 5829 | 565 case ResourceType_Series: |
| 566 if (responseContent_ & ResponseContentFlags_Status) | |
| 567 { | |
|
5676
b744a2cf408a
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5674
diff
changeset
|
568 request_.GetChildrenSpecification(ResourceType_Instance).AddMetadata(MetadataType_Instance_IndexInSeries); // required for the SeriesStatus |
| 5829 | 569 } |
| 570 request_.GetChildrenSpecification(ResourceType_Instance).SetRetrieveIdentifiers(responseContent_ & ResponseContentFlags_Children); | |
| 571 request_.SetRetrieveParentIdentifier(responseContent_ & ResponseContentFlags_Parent); | |
| 572 request_.SetRetrieveAttachments(responseContent_ & ResponseContentFlags_Attachments); | |
| 573 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
574 |
| 5829 | 575 case ResourceType_Instance: |
| 576 request_.SetRetrieveAttachments((responseContent_ & ResponseContentFlags_AttachmentsLegacy) // for FileSize & FileUuid | |
| 577 || (responseContent_ & ResponseContentFlags_Attachments)); | |
| 578 request_.SetRetrieveParentIdentifier(true); | |
| 579 break; | |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
580 |
| 5829 | 581 default: |
| 582 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 5608 | 583 } |
| 584 } | |
| 585 | |
| 586 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
587 void ResourceFinder::SetDatabaseLimits(uint64_t limits) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
588 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
589 databaseLimits_ = limits; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
590 UpdateRequestLimits(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
591 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
592 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
593 |
| 5693 | 594 void ResourceFinder::SetLimitsSince(uint64_t since) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
595 { |
| 5693 | 596 if (hasLimitsSince_) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
597 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
598 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
599 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
600 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
601 { |
| 5693 | 602 hasLimitsSince_ = true; |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
603 limitsSince_ = since; |
| 5693 | 604 UpdateRequestLimits(); |
| 605 } | |
| 606 } | |
| 607 | |
| 608 | |
| 609 void ResourceFinder::SetLimitsCount(uint64_t count) | |
| 610 { | |
| 611 if (hasLimitsCount_) | |
| 612 { | |
| 613 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 614 } | |
| 615 else | |
| 616 { | |
| 617 hasLimitsCount_ = true; | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
618 limitsCount_ = count; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
619 UpdateRequestLimits(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
620 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
621 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
622 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
623 |
|
5682
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
624 void ResourceFinder::SetDatabaseLookup(const DatabaseLookup& lookup) |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
625 { |
| 5694 | 626 MainDicomTagsRegistry registry; |
| 627 | |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
628 lookup_.reset(lookup.Clone()); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
629 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
630 for (size_t i = 0; i < lookup.GetConstraintsCount(); i++) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
631 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
632 DicomTag tag = lookup.GetConstraint(i).GetTag(); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
633 if (IsComputedTag(tag)) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
634 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
635 AddRequestedTag(tag); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
636 } |
| 5694 | 637 else |
| 638 { | |
| 639 ResourceType level; | |
| 640 DicomTagType tagType; | |
| 641 registry.LookupTag(level, tagType, tag); | |
| 642 if (tagType == DicomTagType_Generic) | |
| 643 { | |
| 644 AddRequestedTag(tag); | |
| 645 } | |
| 646 } | |
|
5686
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 |
| 5693 | 649 isSimpleLookup_ = registry.NormalizeLookup(request_.GetDicomTagConstraints(), lookup, request_.GetLevel()); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
650 |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
651 // "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
|
652 |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
653 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
|
654 { |
| 5828 | 655 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
|
656 if (constraint.GetLevel() == request_.GetLevel()) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
657 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
658 request_.SetRetrieveMainDicomTags(true); |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
659 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
660 else if (IsResourceLevelAboveOrEqual(constraint.GetLevel(), request_.GetLevel())) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
661 { |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
662 request_.GetParentSpecification(constraint.GetLevel()).SetRetrieveMainDicomTags(true); |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
663 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
664 else |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
665 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
666 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
|
667 << " 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
|
668 << 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
|
669 } |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
670 |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
671 if (IsComputedTag(constraint.GetTag())) |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
672 { |
|
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
673 // Sanity check |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
674 throw OrthancException(ErrorCode_InternalError); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
675 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
676 } |
|
5692
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
677 |
|
7c11a71927a9
improved handling of limits
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5690
diff
changeset
|
678 UpdateRequestLimits(); |
|
5682
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
679 } |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
680 |
|
fd4c5e064cbe
started refactoring of ServerContext::Apply()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5676
diff
changeset
|
681 |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
682 void ResourceFinder::AddRequestedTag(const DicomTag& tag) |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
683 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
684 requestedTags_.insert(tag); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
685 |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
686 if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
687 { |
|
5620
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
688 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
|
689 { |
| 5697 | 690 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
|
691 } |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
692 else |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
693 { |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
694 /** |
|
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
695 * 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
|
696 * 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
|
697 **/ |
| 5697 | 698 if (request_.GetLevel() == ResourceType_Study) |
| 699 { | |
| 700 request_.SetRetrieveMainDicomTags(true); | |
| 701 } | |
| 702 else | |
| 703 { | |
| 704 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
705 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 706 } |
|
5620
4bfd885fb45f
optimization as patient-level tags are copied at study level
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5619
diff
changeset
|
707 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
708 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
709 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Study)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
710 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
711 if (request_.GetLevel() == ResourceType_Patient) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
712 { |
| 5789 | 713 if (isWarning005Enabled_) |
| 714 { | |
| 715 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 716 << " should only be read at the study, series, or instance level"; | |
| 717 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
718 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
|
719 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
720 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
721 { |
| 5697 | 722 if (request_.GetLevel() == ResourceType_Study) |
| 723 { | |
| 724 request_.SetRetrieveMainDicomTags(true); | |
| 725 } | |
| 726 else | |
| 727 { | |
| 728 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
729 request_.GetParentSpecification(ResourceType_Study).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 730 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
731 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
732 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
733 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Series)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
734 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
735 if (request_.GetLevel() == ResourceType_Patient || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
736 request_.GetLevel() == ResourceType_Study) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
737 { |
| 5789 | 738 if (isWarning005Enabled_) |
| 739 { | |
| 740 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 741 << " should only be read at the series or instance level"; | |
| 742 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
743 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
|
744 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
745 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
746 { |
| 5697 | 747 if (request_.GetLevel() == ResourceType_Series) |
| 748 { | |
| 749 request_.SetRetrieveMainDicomTags(true); | |
| 750 } | |
| 751 else | |
| 752 { | |
| 753 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true); | |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
754 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMetadata(true); // to get the MainDicomSequences |
| 5697 | 755 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
756 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
757 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
758 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Instance)) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
759 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
760 if (request_.GetLevel() == ResourceType_Patient || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
761 request_.GetLevel() == ResourceType_Study || |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
762 request_.GetLevel() == ResourceType_Series) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
763 { |
| 5789 | 764 if (isWarning005Enabled_) |
| 765 { | |
| 766 LOG(WARNING) << "W005: Requested tag " << tag.Format() | |
| 767 << " should only be read at the instance level"; | |
| 768 } | |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
769 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
|
770 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
771 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
772 { |
|
5699
e8e028aed89f
c-find tests pass using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5697
diff
changeset
|
773 request_.SetRetrieveMainDicomTags(true); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
774 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
775 } |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
776 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
777 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
778 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Study); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
779 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
780 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
781 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
782 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
783 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
784 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
785 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
786 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
787 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
788 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES) |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
789 { |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
790 ConfigureChildrenCountComputedTag(tag, ResourceType_Study, ResourceType_Series); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
791 } |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
792 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES) |
|
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_Study, ResourceType_Instance); |
|
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_SERIES_RELATED_INSTANCES) |
|
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_Series, ResourceType_Instance); |
|
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
799 } |
|
5668
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
800 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
|
801 { |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
802 requestedComputedTags_.insert(tag); |
|
5676
b744a2cf408a
shorten ParentRetrieveSpecification/ChildrenRetrieveSpecification as ParentSpecification/ChildrenSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5674
diff
changeset
|
803 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
|
804 } |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
805 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
|
806 { |
|
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
807 requestedComputedTags_.insert(tag); |
|
5752
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
808 if (request_.GetLevel() < ResourceType_Series) |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
809 { |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
810 request_.GetChildrenSpecification(ResourceType_Series).AddMainDicomTag(DICOM_TAG_MODALITY); |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
811 } |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
812 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
|
813 { |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
814 request_.GetParentSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true); |
|
717acb0ea546
fix DICOMWeb integration tests
Alain Mazy <am@orthanc.team>
parents:
5714
diff
changeset
|
815 } |
|
5668
bd1352bd9d82
configuring requests for ModalitiesInStudy and SOPClassesInStudy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5667
diff
changeset
|
816 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
817 else if (tag == DICOM_TAG_INSTANCE_AVAILABILITY) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
818 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
819 requestedComputedTags_.insert(tag); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
820 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
821 else |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
822 { |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
823 // This is neither a main DICOM tag, nor a computed DICOM tag: |
| 5789 | 824 // We might need to access a DICOM file or the MainDicomSequences metadata |
| 825 | |
| 826 request_.SetRetrieveMetadata(true); | |
| 827 | |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
828 if (request_.GetLevel() != ResourceType_Instance) |
|
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
829 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
830 request_.SetRetrieveOneInstanceMetadataAndAttachments(true); |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
831 } |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
832 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
833 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
834 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
835 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
836 void ResourceFinder::AddRequestedTags(const std::set<DicomTag>& tags) |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
837 { |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
838 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
|
839 { |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
840 AddRequestedTag(*it); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
841 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
842 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
843 |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
844 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
845 static void InjectRequestedTags(DicomMap& target, |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
846 std::set<DicomTag>& remainingRequestedTags /* in & out */, |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
847 const FindResponse::Resource& resource, |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
848 ResourceType level/*, |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
849 const std::set<DicomTag>& tags*/) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
850 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
851 if (!remainingRequestedTags.empty() && level <= resource.GetLevel()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
852 { |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
853 std::set<DicomTag> savedMainDicomTags; |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
854 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
855 DicomMap m; |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
856 resource.GetMainDicomTags(m, level); // read DicomTags from DB |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
857 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
858 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
|
859 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
860 GetMainDicomSequencesFromMetadata(m, resource, level); // read DicomSequences from metadata |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
861 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
862 // 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
|
863 |
| 5795 | 864 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
|
865 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
|
866 { |
|
5790
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
867 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
|
868 { |
| 5795 | 869 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
|
870 } |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
871 |
|
a3d283f61304
improved handling of DicomSequences in parent
Alain Mazy <am@orthanc.team>
parents:
5789
diff
changeset
|
872 FromDcmtkBridge::ParseListOfTags(savedMainDicomTags, signature); |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
873 } |
|
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
874 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
875 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
876 std::set<DicomTag> copiedTags; |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
877 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
|
878 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
879 if (target.CopyTagIfExists(m, *it)) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
880 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
881 copiedTags.insert(*it); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
882 } |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
883 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
|
884 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
885 copiedTags.insert(*it); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
886 } |
|
5666
aa231c18b9d2
adding computed tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5665
diff
changeset
|
887 } |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
888 |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
889 Toolbox::RemoveSets(remainingRequestedTags, copiedTags); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
890 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
891 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
892 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
893 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
894 static void ReadMissingTagsFromStorageArea(DicomMap& requestedTags, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
895 ServerContext& context, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
896 const FindRequest& request, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
897 const FindResponse::Resource& resource, |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
898 const std::set<DicomTag>& missingTags) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
899 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
900 OrthancConfiguration::ReaderLock lock; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
901 if (lock.GetConfiguration().IsWarningEnabled(Warnings_001_TagsBeingReadFromStorage)) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
902 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
903 std::string missings; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
904 FromDcmtkBridge::FormatListOfTags(missings, missingTags); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
905 |
|
5699
e8e028aed89f
c-find tests pass using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5697
diff
changeset
|
906 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
|
907 << Orthanc::GetResourceTypeText(resource.GetLevel(), false, false) |
| 5764 | 908 << " " << resource.GetIdentifier() |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
909 << ": " << missings; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
910 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
911 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
912 // 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
|
913 // 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
|
914 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
915 Json::Value tmpDicomAsJson; |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
916 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
917 if (request.GetLevel() == ResourceType_Instance && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
918 request.IsRetrieveMetadata() && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
919 request.IsRetrieveAttachments()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
920 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
921 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
|
922 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
923 context.ReadDicomAsJson(tmpDicomAsJson, resource.GetIdentifier(), resource.GetMetadata(ResourceType_Instance), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
924 resource.GetAttachments(), missingTags /* ignoreTagLength */); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
925 } |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
926 else if (request.GetLevel() != ResourceType_Instance && |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
927 request.IsRetrieveOneInstanceMetadataAndAttachments()) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
928 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
929 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
|
930 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
931 context.ReadDicomAsJson(tmpDicomAsJson, resource.GetOneInstancePublicId(), resource.GetOneInstanceMetadata(), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
932 resource.GetOneInstanceAttachments(), missingTags /* ignoreTagLength */); |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
933 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
934 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
935 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
936 // TODO-FIND: This fallback shouldn't be necessary |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
937 |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
938 FindRequest requestDicomAttachment(request.GetLevel()); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
939 requestDicomAttachment.SetOrthancId(request.GetLevel(), resource.GetIdentifier()); |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
940 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
941 if (request.GetLevel() == ResourceType_Instance) |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
942 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
943 requestDicomAttachment.SetRetrieveMetadata(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
944 requestDicomAttachment.SetRetrieveAttachments(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
945 } |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
946 else |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
947 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
948 requestDicomAttachment.SetRetrieveOneInstanceMetadataAndAttachments(true); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
949 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
950 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
951 FindResponse responseDicomAttachment; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
952 context.GetIndex().ExecuteFind(responseDicomAttachment, requestDicomAttachment); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
953 |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
954 if (responseDicomAttachment.GetSize() != 1) |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
955 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
956 throw OrthancException(ErrorCode_InexistentFile); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
957 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
958 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
959 { |
|
5772
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
960 const FindResponse::Resource& response = responseDicomAttachment.GetResourceByIndex(0); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
961 const std::string instancePublicId = response.GetIdentifier(); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
962 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
|
963 |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
964 if (request.GetLevel() == ResourceType_Instance) |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
965 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
966 context.ReadDicomAsJson(tmpDicomAsJson, response.GetIdentifier(), response.GetMetadata(ResourceType_Instance), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
967 response.GetAttachments(), missingTags /* ignoreTagLength */); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
968 } |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
969 else |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
970 { |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
971 context.ReadDicomAsJson(tmpDicomAsJson, response.GetOneInstancePublicId(), response.GetOneInstanceMetadata(), |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
972 response.GetOneInstanceAttachments(), missingTags /* ignoreTagLength */); |
|
093a8693ba16
replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5764
diff
changeset
|
973 } |
|
5665
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
974 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
975 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
976 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
977 DicomMap tmpDicomMap; |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
978 tmpDicomMap.FromDicomAsJson(tmpDicomAsJson, false /* append */, true /* parseSequences*/); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
979 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
980 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
|
981 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
982 assert(!requestedTags.HasTag(*it)); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
983 if (tmpDicomMap.HasTag(*it)) |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
984 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
985 requestedTags.SetValue(*it, tmpDicomMap.GetValue(*it)); |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
986 } |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
987 else |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
988 { |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
989 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
|
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 |
|
d8c86698110c
implemented computed tag: Instance Availability
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5641
diff
changeset
|
994 |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
995 void ResourceFinder::Execute(IVisitor& visitor, |
|
5621
732ec9feeea8
introduction of FindRequest::ChildrenRetrieveSpecification
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5620
diff
changeset
|
996 ServerContext& context) const |
| 5608 | 997 { |
| 5764 | 998 bool isWarning002Enabled = false; |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
999 bool isWarning004Enabled = false; |
| 5764 | 1000 |
| 1001 { | |
| 1002 OrthancConfiguration::ReaderLock lock; | |
| 1003 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
|
1004 isWarning004Enabled = lock.GetConfiguration().IsWarningEnabled(Warnings_004_NoMainDicomTagsSignature); |
| 5764 | 1005 } |
| 1006 | |
| 5608 | 1007 FindResponse response; |
| 1008 context.GetIndex().ExecuteFind(response, request_); | |
| 1009 | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1010 bool complete; |
| 5693 | 1011 |
| 1012 switch (pagingMode_) | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1013 { |
| 5693 | 1014 case PagingMode_FullDatabase: |
| 1015 case PagingMode_ManualSkip: | |
| 1016 complete = true; | |
| 1017 break; | |
| 1018 | |
| 1019 case PagingMode_FullManual: | |
| 1020 complete = (databaseLimits_ == 0 || | |
| 1021 response.GetSize() <= databaseLimits_); | |
| 1022 break; | |
| 1023 | |
| 1024 default: | |
| 1025 throw OrthancException(ErrorCode_InternalError); | |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1026 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1027 |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
1028 if (lookup_.get() != NULL) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1029 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1030 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
|
1031 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1032 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1033 size_t countResults = 0; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1034 size_t skipped = 0; |
| 5608 | 1035 |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1036 for (size_t i = 0; i < response.GetSize(); i++) |
| 5608 | 1037 { |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1038 const FindResponse::Resource& resource = response.GetResourceByIndex(i); |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1039 |
|
5774
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1040 #if 0 |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1041 { |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1042 Json::Value v; |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1043 resource.DebugExport(v, request_); |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1044 std::cout << v.toStyledString(); |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1045 } |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1046 #endif |
|
f96abfe08946
implementation of specialized SQL commands in SQLiteDatabaseWrapper
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5772
diff
changeset
|
1047 |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1048 DicomMap outRequestedTags; |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1049 |
| 5789 | 1050 if (HasRequestedTags()) |
| 5608 | 1051 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1052 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
|
1053 |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1054 InjectComputedTags(outRequestedTags, resource); |
|
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1055 Toolbox::RemoveSets(remainingRequestedTags, requestedComputedTags_); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1056 |
| 5789 | 1057 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Patient); |
| 1058 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Study); | |
| 1059 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Series); | |
| 1060 InjectRequestedTags(outRequestedTags, remainingRequestedTags, resource, ResourceType_Instance); | |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1061 |
|
5793
a8055aebc6cb
added standard MainDicomTags that are used in QIDO-RS
Alain Mazy <am@orthanc.team>
parents:
5790
diff
changeset
|
1062 if (!remainingRequestedTags.empty() && |
|
a8055aebc6cb
added standard MainDicomTags that are used in QIDO-RS
Alain Mazy <am@orthanc.team>
parents:
5790
diff
changeset
|
1063 !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
|
1064 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1065 if (!allowStorageAccess_) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1066 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1067 throw OrthancException(ErrorCode_BadSequenceOfCalls, |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1068 "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
|
1069 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1070 else |
|
5610
d4b570834d3a
adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5609
diff
changeset
|
1071 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1072 ReadMissingTagsFromStorageArea(outRequestedTags, context, request_, resource, remainingRequestedTags); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1073 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1074 } |
| 5764 | 1075 |
| 1076 std::string mainDicomTagsSignature; | |
| 1077 if (isWarning002Enabled && | |
| 1078 resource.LookupMetadata(mainDicomTagsSignature, resource.GetLevel(), MetadataType_MainDicomTagsSignature) && | |
| 1079 mainDicomTagsSignature != DicomMap::GetMainDicomTagsSignature(resource.GetLevel())) | |
| 1080 { | |
| 1081 LOG(WARNING) << "W002: " << Orthanc::GetResourceTypeText(resource.GetLevel(), false , false) | |
| 5789 | 1082 << " has been stored with another version of Main Dicom Tags list, you should POST to /" |
| 1083 << Orthanc::GetResourceTypeText(resource.GetLevel(), true, false) | |
| 1084 << "/" << resource.GetIdentifier() | |
| 1085 << "/reconstruct to update the list of tags saved in DB or run the Housekeeper plugin. Some MainDicomTags might be missing from this answer."; | |
| 5764 | 1086 } |
| 5789 | 1087 else if (isWarning004Enabled && |
| 1088 request_.IsRetrieveMetadata() && | |
|
5787
42ef98bb3c13
Do not read from disk when not required
Alain Mazy <am@orthanc.team>
parents:
5774
diff
changeset
|
1089 !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
|
1090 { |
| 5789 | 1091 LOG(WARNING) << "W004: " << Orthanc::GetResourceTypeText(resource.GetLevel(), false , false) |
| 1092 << " has been stored with an old Orthanc version and does not have a MainDicomTagsSignature, you should POST to /" | |
| 1093 << Orthanc::GetResourceTypeText(resource.GetLevel(), true, false) | |
| 1094 << "/" << resource.GetIdentifier() | |
| 1095 << "/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
|
1096 } |
| 5764 | 1097 |
|
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 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1100 bool match = true; |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1101 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1102 if (lookup_.get() != NULL) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1103 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1104 DicomMap tags; |
|
5690
708952bd869c
integration tests are passing with ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5689
diff
changeset
|
1105 resource.GetAllMainDicomTags(tags); |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1106 tags.Merge(outRequestedTags); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1107 match = lookup_->IsMatch(tags); |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1108 } |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1109 |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1110 if (match) |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1111 { |
| 5693 | 1112 if (pagingMode_ == PagingMode_FullDatabase) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1113 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1114 visitor.Apply(resource, outRequestedTags); |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1115 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1116 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1117 { |
| 5693 | 1118 if (hasLimitsSince_ && |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1119 skipped < limitsSince_) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1120 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1121 skipped++; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1122 } |
| 5693 | 1123 else if (hasLimitsCount_ && |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1124 countResults >= limitsCount_) |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1125 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1126 // Too many results, don't mark as complete |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1127 complete = false; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1128 break; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1129 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1130 else |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1131 { |
|
5788
61c9e5df64d7
handling of sequences from DB in RequestedTags
Alain Mazy <am@orthanc.team>
parents:
5787
diff
changeset
|
1132 visitor.Apply(resource, outRequestedTags); |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1133 countResults++; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1134 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1135 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1136 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1137 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1138 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1139 if (complete) |
|
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 visitor.MarkAsComplete(); |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1142 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1143 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1144 |
|
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 void ResourceFinder::Execute(Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1147 ServerContext& context, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1148 DicomToJsonFormat format, |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1149 bool includeAllMetadata) const |
|
5688
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 class Visitor : public IVisitor |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1152 { |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1153 private: |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1154 const ResourceFinder& that_; |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1155 ServerIndex& index_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1156 Json::Value& target_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1157 DicomToJsonFormat format_; |
|
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1158 bool hasRequestedTags_; |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1159 bool includeAllMetadata_; |
|
5688
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 public: |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1162 Visitor(const ResourceFinder& that, |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1163 ServerIndex& index, |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1164 Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1165 DicomToJsonFormat format, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1166 bool hasRequestedTags, |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1167 bool includeAllMetadata) : |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1168 that_(that), |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1169 index_(index), |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1170 target_(target), |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1171 format_(format), |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1172 hasRequestedTags_(hasRequestedTags), |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1173 includeAllMetadata_(includeAllMetadata) |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1174 { |
|
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 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1177 virtual void Apply(const FindResponse::Resource& resource, |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1178 const DicomMap& requestedTags) ORTHANC_OVERRIDE |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1179 { |
| 5829 | 1180 if (that_.responseContent_ != ResponseContentFlags_ID) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1181 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1182 Json::Value item; |
| 5829 | 1183 that_.Expand(item, resource, index_, format_); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1184 |
|
5696
0f8b6214308a
preparing to use ResourceFinder in OrthancFindRequestHandler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5694
diff
changeset
|
1185 if (hasRequestedTags_) |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1186 { |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1187 static const char* const REQUESTED_TAGS = "RequestedTags"; |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1188 item[REQUESTED_TAGS] = Json::objectValue; |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1189 FromDcmtkBridge::ToJson(item[REQUESTED_TAGS], requestedTags, format_); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1190 } |
|
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1191 |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1192 target_.append(item); |
|
5609
4690a0d2b01e
preliminary support of requestedTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5608
diff
changeset
|
1193 } |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1194 else |
|
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1195 { |
|
5688
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1196 target_.append(resource.GetIdentifier()); |
|
5686
11575590e493
integrating DatabaseLookup into ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5682
diff
changeset
|
1197 } |
| 5608 | 1198 } |
|
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 virtual void MarkAsComplete() ORTHANC_OVERRIDE |
|
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 } |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1203 }; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1204 |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1205 target = Json::arrayValue; |
|
d0a264b803f1
first implementation of database paging
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5686
diff
changeset
|
1206 |
| 5789 | 1207 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
|
1208 Execute(visitor, context); |
| 5608 | 1209 } |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1210 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1211 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1212 bool ResourceFinder::ExecuteOneResource(Json::Value& target, |
|
5709
476b1db52110
removed the "format_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5702
diff
changeset
|
1213 ServerContext& context, |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1214 DicomToJsonFormat format, |
|
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1215 bool includeAllMetadata) const |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1216 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1217 Json::Value answer; |
|
5713
d851a54e49b7
removed "includeAllMetadata_" member from ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5709
diff
changeset
|
1218 Execute(answer, context, format, includeAllMetadata); |
|
5615
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1219 |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1220 if (answer.type() != Json::arrayValue) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1221 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1222 throw OrthancException(ErrorCode_InternalError); |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1223 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1224 else if (answer.size() > 1) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1225 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1226 throw OrthancException(ErrorCode_DatabasePlugin); |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1227 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1228 else if (answer.empty()) |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1229 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1230 // 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
|
1231 return false; |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1232 } |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1233 else |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1234 { |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1235 target = answer[0]; |
|
a10978a5e65c
expansion of single resources using ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
5612
diff
changeset
|
1236 return true; |
|
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 } |
| 5608 | 1239 } |