orthanc: OrthancServer/Sources/ResourceFinder.cpp annotate

annotate OrthancServer/Sources/ResourceFinder.cpp @ 5668:bd1352bd9d82 find-refactoring

configuring requests for ModalitiesInStudy and SOPClassesInStudy

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 04 Jul 2024 21:57:39 +0200
parents	93dff1fccf36
children	e300f22a46f0

rev	line source
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * modify it under the terms of the GNU General Public License as
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * published by the Free Software Foundation, either version 3 of the
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * License, or (at your option) any later version.
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * General Public License for more details.
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * You should have received a copy of the GNU General Public License
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "PrecompiledHeadersServer.h"
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "ResourceFinder.h"
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 #include "../../OrthancFramework/Sources/OrthancException.h"
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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"
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 #include "ServerContext.h"
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 #include "ServerIndex.h"
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 namespace Orthanc
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	38 void ResourceFinder::ConfigureChildrenCountComputedTag(DicomTag tag,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	39 ResourceType parentLevel,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	40 ResourceType childLevel)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	41 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	42 if (request_.GetLevel() == parentLevel)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	43 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	44 requestedComputedTags_.insert(tag);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	45 hasRequestedTags_ = true;
5667 93dff1fccf36 recursive descent to the children Sebastien Jodogne <s.jodogne@gmail.com> parents: 5666 diff changeset	46 request_.GetChildrenRetrieveSpecification(childLevel).SetRetrieveIdentifiers(true);
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	47 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	48 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	49
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	50
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	51 void ResourceFinder::InjectChildrenCountComputedTag(DicomMap& requestedTags,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	52 DicomTag tag,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	53 const FindResponse::Resource& resource,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	54 ResourceType level) const
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 (IsRequestedComputedTag(tag))
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 const std::set<std::string>& children = resource.GetChildrenIdentifiers(level);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	59 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	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::InjectComputedTags(DicomMap& requestedTags,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	65 const FindResponse::Resource& resource) const
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	66 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	67 switch (resource.GetLevel())
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 case ResourceType_Patient:
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	70 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	71 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	72 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	73 break;
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 case ResourceType_Study:
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	76 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	77 InjectChildrenCountComputedTag(requestedTags, DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES, resource, ResourceType_Instance);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	78 break;
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 case ResourceType_Series:
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	81 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	82 break;
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	83
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	84 case ResourceType_Instance:
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	85 if (IsRequestedComputedTag(DICOM_TAG_INSTANCE_AVAILABILITY))
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	86 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	87 requestedTags.SetValue(DICOM_TAG_INSTANCE_AVAILABILITY, "ONLINE", false);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	88 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	89 break;
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	90
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	91 default:
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	92 throw OrthancException(ErrorCode_InternalError);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	93 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	94 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	95
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	96
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 SeriesStatus ResourceFinder::GetSeriesStatus(uint32_t& expectedNumberOfInstances,
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 const FindResponse::Resource& resource) const
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 if (request_.GetLevel() != ResourceType_Series)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 throw OrthancException(ErrorCode_BadParameterType);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 std::string s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 if (!resource.LookupMetadata(s, ResourceType_Series, MetadataType_Series_ExpectedNumberOfInstances) \|\|
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 !SerializationToolbox::ParseUnsignedInteger32(expectedNumberOfInstances, s))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 return SeriesStatus_Unknown;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 std::list<std::string> values;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 if (!resource.LookupChildrenMetadata(values, MetadataType_Instance_IndexInSeries))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 throw OrthancException(ErrorCode_BadSequenceOfCalls);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 std::set<int64_t> instances;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 for (std::list<std::string>::const_iterator
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 it = values.begin(); it != values.end(); ++it)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 int64_t index;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 if (!SerializationToolbox::ParseInteger64(index, *it))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 return SeriesStatus_Unknown;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 if (index <= 0 \|\|
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 index > static_cast<int64_t>(expectedNumberOfInstances))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 // Out-of-range instance index
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 return SeriesStatus_Inconsistent;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 if (instances.find(index) != instances.end())
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 // Twice the same instance index
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 return SeriesStatus_Inconsistent;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 instances.insert(index);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 if (instances.size() == static_cast<size_t>(expectedNumberOfInstances))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 return SeriesStatus_Complete;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 else
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 return SeriesStatus_Missing;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 void ResourceFinder::Expand(Json::Value& target,
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 const FindResponse::Resource& resource,
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 ServerIndex& index) const
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 /**
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 * This method closely follows "SerializeExpandedResource()" in
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 * "ServerContext.cpp" from Orthanc 1.12.3.
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 **/
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 if (resource.GetLevel() != request_.GetLevel())
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 throw OrthancException(ErrorCode_InternalError);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 target = Json::objectValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 target["Type"] = GetResourceTypeText(resource.GetLevel(), false, true);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 target["ID"] = resource.GetIdentifier();
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 switch (resource.GetLevel())
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 case ResourceType_Patient:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 case ResourceType_Study:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 target["ParentPatient"] = resource.GetParentIdentifier();
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 case ResourceType_Series:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 target["ParentStudy"] = resource.GetParentIdentifier();
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 case ResourceType_Instance:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 target["ParentSeries"] = resource.GetParentIdentifier();
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 default:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 throw OrthancException(ErrorCode_InternalError);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 if (resource.GetLevel() != ResourceType_Instance)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	199 const std::set<std::string>& children = resource.GetChildrenIdentifiers(GetChildResourceType(resource.GetLevel()));
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 Json::Value c = Json::arrayValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 for (std::set<std::string>::const_iterator
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 it = children.begin(); it != children.end(); ++it)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 c.append(*it);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 switch (resource.GetLevel())
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 case ResourceType_Patient:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 target["Studies"] = c;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 case ResourceType_Study:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 target["Series"] = c;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 case ResourceType_Series:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 target["Instances"] = c;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 default:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 throw OrthancException(ErrorCode_InternalError);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 switch (resource.GetLevel())
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 case ResourceType_Patient:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 case ResourceType_Study:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 case ResourceType_Series:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 uint32_t expectedNumberOfInstances;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 SeriesStatus status = GetSeriesStatus(expectedNumberOfInstances, resource);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 target["Status"] = EnumerationToString(status);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	240 static const char* const EXPECTED_NUMBER_OF_INSTANCES = "ExpectedNumberOfInstances";
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 if (status == SeriesStatus_Unknown)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 target[EXPECTED_NUMBER_OF_INSTANCES] = Json::nullValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 else
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 target[EXPECTED_NUMBER_OF_INSTANCES] = expectedNumberOfInstances;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 case ResourceType_Instance:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 FileInfo info;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 if (resource.LookupAttachment(info, FileContentType_Dicom))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 target["FileSize"] = static_cast<Json::UInt64>(info.GetUncompressedSize());
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 target["FileUuid"] = info.GetUuid();
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 else
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 throw OrthancException(ErrorCode_InternalError);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	267 static const char* const INDEX_IN_SERIES = "IndexInSeries";
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 std::string s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 uint32_t index;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 if (resource.LookupMetadata(s, ResourceType_Instance, MetadataType_Instance_IndexInSeries) &&
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 SerializationToolbox::ParseUnsignedInteger32(index, s))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 target[INDEX_IN_SERIES] = index;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 else
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 target[INDEX_IN_SERIES] = Json::nullValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 break;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 default:
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 throw OrthancException(ErrorCode_InternalError);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 std::string s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_AnonymizedFrom))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 target["AnonymizedFrom"] = s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_ModifiedFrom))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 target["ModifiedFrom"] = s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 if (resource.GetLevel() == ResourceType_Patient \|\|
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 resource.GetLevel() == ResourceType_Study \|\|
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 resource.GetLevel() == ResourceType_Series)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 target["IsStable"] = !index.IsUnstableResource(resource.GetLevel(), resource.GetInternalId());
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 if (resource.LookupMetadata(s, resource.GetLevel(), MetadataType_LastUpdate))
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 target["LastUpdate"] = s;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	312 DicomMap allMainDicomTags;
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	313 resource.GetMainDicomTags(allMainDicomTags, resource.GetLevel());
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	314
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	315 /**
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	316 * This section was part of "StatelessDatabaseOperations::ExpandResource()"
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	317 * in Orthanc <= 1.12.3
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	318 **/
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	319
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	320 // read all main sequences from DB
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	321 std::string serializedSequences;
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	322 if (resource.LookupMetadata(serializedSequences, resource.GetLevel(), MetadataType_MainDicomSequences))
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	323 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	324 Json::Value jsonMetadata;
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	325 Toolbox::ReadJson(jsonMetadata, serializedSequences);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	326
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	327 if (jsonMetadata["Version"].asInt() == 1)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	328 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	329 allMainDicomTags.FromDicomAsJson(jsonMetadata["Sequences"], true /* append /, true / parseSequences */);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	330 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	331 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	332 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	333 throw OrthancException(ErrorCode_NotImplemented);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	334 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	335 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	336
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	337 /**
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	338 * End of section from StatelessDatabaseOperations
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	339 **/
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	340
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	341
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 static const char* const MAIN_DICOM_TAGS = "MainDicomTags";
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 static const char* const PATIENT_MAIN_DICOM_TAGS = "PatientMainDicomTags";
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	345 // TODO-FIND : Ignore "null" values
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 DicomMap levelMainDicomTags;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 allMainDicomTags.ExtractResourceInformation(levelMainDicomTags, resource.GetLevel());
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 target[MAIN_DICOM_TAGS] = Json::objectValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 FromDcmtkBridge::ToJson(target[MAIN_DICOM_TAGS], levelMainDicomTags, format_);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 if (resource.GetLevel() == ResourceType_Study)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 DicomMap patientMainDicomTags;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 allMainDicomTags.ExtractPatientInformation(patientMainDicomTags);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 target[PATIENT_MAIN_DICOM_TAGS] = Json::objectValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 FromDcmtkBridge::ToJson(target[PATIENT_MAIN_DICOM_TAGS], patientMainDicomTags, format_);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 Json::Value labels = Json::arrayValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 for (std::set<std::string>::const_iterator
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 it = resource.GetLabels().begin(); it != resource.GetLabels().end(); ++it)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 labels.append(*it);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 target["Labels"] = labels;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 if (includeAllMetadata_) // new in Orthanc 1.12.4
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 const std::map<MetadataType, std::string>& m = resource.GetMetadata(resource.GetLevel());
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 Json::Value metadata = Json::objectValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 for (std::map<MetadataType, std::string>::const_iterator it = m.begin(); it != m.end(); ++it)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 metadata[EnumerationToString(it->first)] = it->second;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 target["Metadata"] = metadata;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 ResourceFinder::ResourceFinder(ResourceType level,
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 bool expand) :
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 request_(level),
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 expand_(expand),
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 format_(DicomToJsonFormat_Human),
5617 8905ffa45fc2 started listing of children resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 5616 diff changeset	396 allowStorageAccess_(true),
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	397 hasRequestedTags_(false),
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 includeAllMetadata_(false)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 if (expand)
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 {
5619 1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	402 request_.SetRetrieveMainDicomTags(true);
1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	403 request_.SetRetrieveMetadata(true);
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 request_.SetRetrieveLabels(true);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	406 switch (level)
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 {
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	408 case ResourceType_Patient:
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	409 request_.GetChildrenRetrieveSpecification(ResourceType_Study).SetRetrieveIdentifiers(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	410 break;
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	411
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	412 case ResourceType_Study:
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	413 request_.GetChildrenRetrieveSpecification(ResourceType_Series).SetRetrieveIdentifiers(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	414 request_.SetRetrieveParentIdentifier(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	415 break;
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	417 case ResourceType_Series:
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	418 request_.AddRetrieveChildrenMetadata(MetadataType_Instance_IndexInSeries); // required for the SeriesStatus
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	419 request_.GetChildrenRetrieveSpecification(ResourceType_Instance).SetRetrieveIdentifiers(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	420 request_.SetRetrieveParentIdentifier(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	421 break;
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	422
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	423 case ResourceType_Instance:
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	424 request_.SetRetrieveAttachments(true); // for FileSize & FileUuid
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	425 request_.SetRetrieveParentIdentifier(true);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	426 break;
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	427
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	428 default:
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	429 throw OrthancException(ErrorCode_ParameterOutOfRange);
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	435 void ResourceFinder::AddRequestedTags(const DicomTag& tag)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	436 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	437 if (DicomMap::IsMainDicomTag(tag, ResourceType_Patient))
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	438 {
5620 4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	439 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	440 {
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	441 request_.GetParentRetrieveSpecification(ResourceType_Patient).SetRetrieveMainDicomTags(true);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	442 request_.GetParentRetrieveSpecification(ResourceType_Patient).SetRetrieveMetadata(true);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	443 requestedPatientTags_.insert(tag);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	444 }
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	445 else
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	446 {
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	447 /**
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	448 * 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	449 * 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	450 **/
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	451 request_.GetParentRetrieveSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	452 request_.GetParentRetrieveSpecification(ResourceType_Study).SetRetrieveMetadata(true);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	453 requestedStudyTags_.insert(tag);
4bfd885fb45f optimization as patient-level tags are copied at study level Sebastien Jodogne <s.jodogne@gmail.com> parents: 5619 diff changeset	454 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	455
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	456 hasRequestedTags_ = true;
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	457 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	458 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Study))
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	459 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	460 if (request_.GetLevel() == ResourceType_Patient)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	461 {
5612 599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	462 LOG(WARNING) << "Requested tag " << tag.Format()
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	463 << " should only be read at the study, series, or instance level";
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	464 requestedTagsFromFileStorage_.insert(tag);
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	465 request_.SetRetrieveOneInstanceIdentifier(true);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	466 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	467 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	468 {
5619 1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	469 request_.GetParentRetrieveSpecification(ResourceType_Study).SetRetrieveMainDicomTags(true);
1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	470 request_.GetParentRetrieveSpecification(ResourceType_Study).SetRetrieveMetadata(true);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	471 requestedStudyTags_.insert(tag);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	472 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	473
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	474 hasRequestedTags_ = true;
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	475 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	476 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Series))
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	477 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	478 if (request_.GetLevel() == ResourceType_Patient \|\|
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	479 request_.GetLevel() == ResourceType_Study)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	480 {
5612 599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	481 LOG(WARNING) << "Requested tag " << tag.Format()
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	482 << " should only be read at the series or instance level";
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	483 requestedTagsFromFileStorage_.insert(tag);
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	484 request_.SetRetrieveOneInstanceIdentifier(true);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	485 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	486 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	487 {
5619 1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	488 request_.GetParentRetrieveSpecification(ResourceType_Series).SetRetrieveMainDicomTags(true);
1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	489 request_.GetParentRetrieveSpecification(ResourceType_Series).SetRetrieveMetadata(true);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	490 requestedSeriesTags_.insert(tag);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	491 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	492
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	493 hasRequestedTags_ = true;
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	494 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	495 else if (DicomMap::IsMainDicomTag(tag, ResourceType_Instance))
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	496 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	497 if (request_.GetLevel() == ResourceType_Patient \|\|
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	498 request_.GetLevel() == ResourceType_Study \|\|
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	499 request_.GetLevel() == ResourceType_Series)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	500 {
5612 599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	501 LOG(WARNING) << "Requested tag " << tag.Format()
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	502 << " should only be read at the instance level";
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	503 requestedTagsFromFileStorage_.insert(tag);
599ce5ed126c added more tolerance to behave like previous releases Sebastien Jodogne <s.jodogne@gmail.com> parents: 5610 diff changeset	504 request_.SetRetrieveOneInstanceIdentifier(true);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	505 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	506 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	507 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	508 // Main DICOM tags from the instance level will be retrieved anyway
5619 1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	509 assert(request_.IsRetrieveMainDicomTags());
1864b16bc7b1 added FindRequest::ParentRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5617 diff changeset	510 assert(request_.IsRetrieveMetadata());
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	511 requestedInstanceTags_.insert(tag);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	512 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	513
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	514 hasRequestedTags_ = true;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	515 }
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	516 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	517 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	518 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Study);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	519 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	520 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	521 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	522 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Series);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	523 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	524 else if (tag == DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	525 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	526 ConfigureChildrenCountComputedTag(tag, ResourceType_Patient, ResourceType_Instance);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	527 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	528 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	529 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	530 ConfigureChildrenCountComputedTag(tag, ResourceType_Study, ResourceType_Series);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	531 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	532 else if (tag == DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	533 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	534 ConfigureChildrenCountComputedTag(tag, ResourceType_Study, ResourceType_Instance);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	535 }
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	536 else if (tag == DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	537 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	538 ConfigureChildrenCountComputedTag(tag, ResourceType_Series, ResourceType_Instance);
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	539 }
5668 bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	540 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	541 {
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	542 requestedComputedTags_.insert(tag);
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	543 hasRequestedTags_ = true;
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	544 request_.GetChildrenRetrieveSpecification(ResourceType_Instance).AddMetadata(MetadataType_Instance_SopClassUid);
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	545 }
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	546 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	547 {
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	548 requestedComputedTags_.insert(tag);
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	549 hasRequestedTags_ = true;
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	550 request_.GetChildrenRetrieveSpecification(ResourceType_Series).AddMainDicomTag(DICOM_TAG_MODALITY);
bd1352bd9d82 configuring requests for ModalitiesInStudy and SOPClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5667 diff changeset	551 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	552 else if (tag == DICOM_TAG_INSTANCE_AVAILABILITY)
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	553 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	554 requestedComputedTags_.insert(tag);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	555 hasRequestedTags_ = true;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	556 }
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	557 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	558 {
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	559 // This is neither a main DICOM tag, nor a computed DICOM tag:
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	560 // We will be forced to access the DICOM file anyway
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	561 requestedTagsFromFileStorage_.insert(tag);
5610 d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	562
d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	563 if (request_.GetLevel() != ResourceType_Instance)
d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	564 {
d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	565 request_.SetRetrieveOneInstanceIdentifier(true);
d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	566 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	567
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	568 hasRequestedTags_ = true;
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	569 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	570 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	571
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	572
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	573 void ResourceFinder::AddRequestedTags(const std::set<DicomTag>& tags)
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	574 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	575 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	576 {
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	577 AddRequestedTags(*it);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	578 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	579 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	580
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	581
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	582 static void InjectRequestedTags(DicomMap& requestedTags,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	583 std::set<DicomTag>& missingTags /* out */,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	584 const FindResponse::Resource& resource,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	585 ResourceType level,
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	586 const std::set<DicomTag>& tags)
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	587 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	588 if (!tags.empty())
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	589 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	590 DicomMap m;
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	591 resource.GetMainDicomTags(m, level);
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	592
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	593 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	594 {
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	595 std::string value;
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	596 if (m.LookupStringValue(value, it, false / not binary */))
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	597 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	598 requestedTags.SetValue(it, value, false / not binary */);
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	599 }
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	600 else
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	601 {
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	602 // This is the case where the Housekeeper should be run
aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	603 missingTags.insert(*it);
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	604 }
5666 aa231c18b9d2 adding computed tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5665 diff changeset	605 }
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	606 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	607 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	608
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	609
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	610 static void ReadMissingTagsFromStorageArea(DicomMap& requestedTags,
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	611 ServerContext& context,
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	612 const FindRequest& request,
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	613 const FindResponse::Resource& resource,
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	614 const std::set<DicomTag>& missingTags)
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	615 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	616 OrthancConfiguration::ReaderLock lock;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	617 if (lock.GetConfiguration().IsWarningEnabled(Warnings_001_TagsBeingReadFromStorage))
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	618 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	619 std::string missings;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	620 FromDcmtkBridge::FormatListOfTags(missings, missingTags);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	621
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	622 LOG(WARNING) << "W001: Accessing Dicom tags from storage when accessing "
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	623 << Orthanc::GetResourceTypeText(resource.GetLevel(), false, false)
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	624 << ": " << missings;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	625 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	626
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	627 std::string instancePublicId;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	628
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	629 if (request.IsRetrieveOneInstanceIdentifier())
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	630 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	631 instancePublicId = resource.GetOneInstanceIdentifier();
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	632 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	633 else if (request.GetLevel() == ResourceType_Instance)
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	634 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	635 instancePublicId = resource.GetIdentifier();
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	636 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	637 else
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	638 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	639 FindRequest requestDicomAttachment(request.GetLevel());
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	640 requestDicomAttachment.SetOrthancId(request.GetLevel(), resource.GetIdentifier());
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	641 requestDicomAttachment.SetRetrieveOneInstanceIdentifier(true);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	642
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	643 FindResponse responseDicomAttachment;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	644 context.GetIndex().ExecuteFind(responseDicomAttachment, requestDicomAttachment);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	645
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	646 if (responseDicomAttachment.GetSize() != 1 \|\|
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	647 !responseDicomAttachment.GetResourceByIndex(0).HasOneInstanceIdentifier())
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	648 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	649 throw OrthancException(ErrorCode_InexistentFile);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	650 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	651 else
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	652 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	653 instancePublicId = responseDicomAttachment.GetResourceByIndex(0).GetOneInstanceIdentifier();
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	654 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	655 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	656
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	657 LOG(INFO) << "Will retrieve missing DICOM tags from instance: " << instancePublicId;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	658
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	659 // TODO-FIND: What do we do if the DICOM has been removed since the request?
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	660 // Do we fail, or do we skip the resource?
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	661
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	662 Json::Value tmpDicomAsJson;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	663 context.ReadDicomAsJson(tmpDicomAsJson, instancePublicId, missingTags /* ignoreTagLength */);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	664
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	665 DicomMap tmpDicomMap;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	666 tmpDicomMap.FromDicomAsJson(tmpDicomAsJson, false /* append /, true / parseSequences*/);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	667
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	668 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	669 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	670 assert(!requestedTags.HasTag(*it));
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	671 if (tmpDicomMap.HasTag(*it))
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	672 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	673 requestedTags.SetValue(it, tmpDicomMap.GetValue(it));
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	674 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	675 else
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	676 {
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	677 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	678 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	679 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	680 }
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	681
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	682
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 void ResourceFinder::Execute(Json::Value& target,
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	684 ServerContext& context) const
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 FindResponse response;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 context.GetIndex().ExecuteFind(response, request_);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 target = Json::arrayValue;
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	691 for (size_t i = 0; i < response.GetSize(); i++)
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 {
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	693 const FindResponse::Resource& resource = response.GetResourceByIndex(i);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	694
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	695 {
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	696 Json::Value v;
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	697 resource.DebugExport(v, request_);
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	698 std::cout << v.toStyledString();
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	699 }
732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	700
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	701 if (expand_)
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 {
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 Json::Value item;
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	704 Expand(item, resource, context.GetIndex());
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	705
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	706 if (hasRequestedTags_)
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	707 {
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	708 DicomMap requestedTags;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	709 InjectComputedTags(requestedTags, resource);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	710
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	711 std::set<DicomTag> missingTags = requestedTagsFromFileStorage_;
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	712 InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Patient, requestedPatientTags_);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	713 InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Study, requestedStudyTags_);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	714 InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Series, requestedSeriesTags_);
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	715 InjectRequestedTags(requestedTags, missingTags, resource, ResourceType_Instance, requestedInstanceTags_);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	716
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	717 if (!missingTags.empty())
5610 d4b570834d3a adding safeguards around FindRequest::SetRetrieveOneInstanceIdentifier() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5609 diff changeset	718 {
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	719 if (!allowStorageAccess_)
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	720 {
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	721 throw OrthancException(ErrorCode_BadSequenceOfCalls,
d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	722 "Cannot add missing requested tags, as access to file storage is disallowed");
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	723 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	724 else
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	725 {
5665 d8c86698110c implemented computed tag: Instance Availability Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	726 ReadMissingTagsFromStorageArea(requestedTags, context, request_, resource, missingTags);
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	727 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	728 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	729
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	730 static const char* const REQUESTED_TAGS = "RequestedTags";
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	731 item[REQUESTED_TAGS] = Json::objectValue;
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	732 FromDcmtkBridge::ToJson(item[REQUESTED_TAGS], requestedTags, format_);
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	733 }
4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	734
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 target.append(item);
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 }
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	737 else
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 {
5609 4690a0d2b01e preliminary support of requestedTags Sebastien Jodogne <s.jodogne@gmail.com> parents: 5608 diff changeset	739 target.append(resource.GetIdentifier());
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 }
3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 }
5615 a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	743
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	744
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	745 bool ResourceFinder::ExecuteOneResource(Json::Value& target,
5621 732ec9feeea8 introduction of FindRequest::ChildrenRetrieveSpecification Sebastien Jodogne <s.jodogne@gmail.com> parents: 5620 diff changeset	746 ServerContext& context) const
5615 a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	747 {
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	748 Json::Value answer;
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	749 Execute(answer, context);
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	750
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	751 if (answer.type() != Json::arrayValue)
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	752 {
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	753 throw OrthancException(ErrorCode_InternalError);
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	754 }
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	755 else if (answer.size() > 1)
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	756 {
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	757 throw OrthancException(ErrorCode_DatabasePlugin);
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	758 }
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	759 else if (answer.empty())
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	760 {
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	761 // 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	762 return false;
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	763 }
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	764 else
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	765 {
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	766 target = answer[0];
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	767 return true;
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	768 }
a10978a5e65c expansion of single resources using ResourceFinder Sebastien Jodogne <s.jodogne@gmail.com> parents: 5612 diff changeset	769 }
5608 3d0aa94b44b3 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/ResourceFinder.cpp @ 5668:bd1352bd9d82 find-refactoring