orthanc: OrthancServer/OrthancFindRequestHandler.cpp annotate

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 3163:cf91b6f22278

Fix issue #90 (C-Find shall match missing tags to null/empty string)

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 24 Jan 2019 18:04:55 +0100
parents	beeeb6096f27
children	8ea7c4546c3a

rev	line source
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1898 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	4 * Department, University Hospital of Liege, Belgium
3060 4e43e67f8ecf preparing for 2019 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3021 diff changeset	5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "PrecompiledHeadersServer.h"
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "OrthancFindRequestHandler.h"
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	37 #include "../Core/DicomFormat/DicomArray.h"
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	38 #include "../Core/DicomParsing/FromDcmtkBridge.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	39 #include "../Core/Logging.h"
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	40 #include "../Core/Lua/LuaFunctionCall.h"
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	41 #include "OrthancConfiguration.h"
3094 61da3c9b4121 cont reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	42 #include "Search/DatabaseLookup.h"
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	43 #include "ServerContext.h"
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	44 #include "ServerToolbox.h"
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	45
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	46 #include <boost/regex.hpp>
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	47
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	48
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	49 namespace Orthanc
94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	50 {
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	51 static void GetChildren(std::list<std::string>& target,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	52 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	53 const std::list<std::string>& source)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	54 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	55 target.clear();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	56
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	57 for (std::list<std::string>::const_iterator
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	58 it = source.begin(); it != source.end(); ++it)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	59 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	60 std::list<std::string> tmp;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	61 index.GetChildren(tmp, *it);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	62 target.splice(target.end(), tmp);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	63 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	64 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	65
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	66
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	67 static void StoreSetOfStrings(DicomMap& result,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	68 const DicomTag& tag,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	69 const std::set<std::string>& values)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	70 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	71 bool isFirst = true;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	72
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	73 std::string s;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	74 for (std::set<std::string>::const_iterator
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	75 it = values.begin(); it != values.end(); ++it)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	76 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	77 if (isFirst)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	78 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	79 isFirst = false;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	80 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	81 else
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	82 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	83 s += "\\";
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	84 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	85
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	86 s += *it;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	87 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	88
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	89 result.SetValue(tag, s, false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	90 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	91
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	92
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	93 static void ComputePatientCounters(DicomMap& result,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	94 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	95 const std::string& patient,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	96 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	97 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	98 std::list<std::string> studies;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	99 index.GetChildren(studies, patient);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	100
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	101 if (query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	102 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	103 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	104 boost::lexical_cast<std::string>(studies.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	105 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	106
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	107 if (!query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	108 !query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	109 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	110 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	111 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	112
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	113 std::list<std::string> series;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	114 GetChildren(series, index, studies);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	115 studies.clear(); // This information is useless below
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	116
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	117 if (query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	118 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	119 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	120 boost::lexical_cast<std::string>(series.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	121 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	122
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	123 if (!query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	124 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	125 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	126 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	127
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	128 std::list<std::string> instances;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	129 GetChildren(instances, index, series);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	130
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	131 if (query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	132 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	133 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	134 boost::lexical_cast<std::string>(instances.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	135 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	136 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	137
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	138
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	139 static void ComputeStudyCounters(DicomMap& result,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	140 ServerContext& context,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	141 const std::string& study,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	142 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	143 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	144 ServerIndex& index = context.GetIndex();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	145
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	146 std::list<std::string> series;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	147 index.GetChildren(series, study);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	148
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	149 if (query.HasTag(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	150 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	151 result.SetValue(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	152 boost::lexical_cast<std::string>(series.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	153 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	154
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	155 if (query.HasTag(DICOM_TAG_MODALITIES_IN_STUDY))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	156 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	157 std::set<std::string> values;
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	158
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	159 for (std::list<std::string>::const_iterator
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	160 it = series.begin(); it != series.end(); ++it)
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	161 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	162 DicomMap tags;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	163 if (index.GetMainDicomTags(tags, *it, ResourceType_Series, ResourceType_Series))
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	164 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	165 const DicomValue* value = tags.TestAndGetValue(DICOM_TAG_MODALITY);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	166
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	167 if (value != NULL &&
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	168 !value->IsNull() &&
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	169 !value->IsBinary())
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	170 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	171 values.insert(value->GetContent());
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	172 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	173 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	174 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	175
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	176 StoreSetOfStrings(result, DICOM_TAG_MODALITIES_IN_STUDY, values);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	177 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	178
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	179 if (!query.HasTag(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	180 !query.HasTag(DICOM_TAG_SOP_CLASSES_IN_STUDY))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	181 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	182 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	183 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	184
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	185 std::list<std::string> instances;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	186 GetChildren(instances, index, series);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	187
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	188 if (query.HasTag(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	189 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	190 result.SetValue(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	191 boost::lexical_cast<std::string>(instances.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	192 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	193
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	194 if (query.HasTag(DICOM_TAG_SOP_CLASSES_IN_STUDY))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	195 {
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	196 std::set<std::string> values;
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	197
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	198 for (std::list<std::string>::const_iterator
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	199 it = instances.begin(); it != instances.end(); ++it)
2039 e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	200 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	201 std::string value;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	202 if (context.LookupOrReconstructMetadata(value, *it, MetadataType_Instance_SopClassUid))
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	203 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	204 values.insert(value);
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	205 }
2039 e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	206 }
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	207
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	208 StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	209 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	210 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	211
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	212
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	213 static void ComputeSeriesCounters(DicomMap& result,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	214 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	215 const std::string& series,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	216 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	217 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	218 std::list<std::string> instances;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	219 index.GetChildren(instances, series);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	220
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	221 if (query.HasTag(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	222 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	223 result.SetValue(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	224 boost::lexical_cast<std::string>(instances.size()), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	225 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	226 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	227
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	228
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	229 static DicomMap* ComputeCounters(ServerContext& context,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	230 const std::string& instanceId,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	231 ResourceType level,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	232 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	233 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	234 switch (level)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	235 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	236 case ResourceType_Patient:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	237 if (!query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	238 !query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	239 !query.HasTag(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	240 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	241 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	242 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	243
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	244 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	245
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	246 case ResourceType_Study:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	247 if (!query.HasTag(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	248 !query.HasTag(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	249 !query.HasTag(DICOM_TAG_SOP_CLASSES_IN_STUDY) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	250 !query.HasTag(DICOM_TAG_MODALITIES_IN_STUDY))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	251 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	252 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	253 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	254
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	255 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	256
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	257 case ResourceType_Series:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	258 if (!query.HasTag(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	259 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	260 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	261 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	262
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	263 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	264
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	265 default:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	266 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	267 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	268
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	269 std::string parent;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	270 if (!context.GetIndex().LookupParent(parent, instanceId, level))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	271 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	272 throw OrthancException(ErrorCode_UnknownResource); // The resource was deleted in between
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	273 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	274
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	275 std::auto_ptr<DicomMap> result(new DicomMap);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	276
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	277 switch (level)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	278 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	279 case ResourceType_Patient:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	280 ComputePatientCounters(*result, context.GetIndex(), parent, query);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	281 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	282
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	283 case ResourceType_Study:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	284 ComputeStudyCounters(*result, context, parent, query);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	285 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	286
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	287 case ResourceType_Series:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	288 ComputeSeriesCounters(*result, context.GetIndex(), parent, query);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	289 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	290
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	291 default:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	292 throw OrthancException(ErrorCode_InternalError);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	293 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	294
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	295 return result.release();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	296 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	297
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	298
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	299 static void AddAnswer(DicomFindAnswers& answers,
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	300 const DicomMap& mainDicomTags,
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	301 const Json::Value* dicomAsJson,
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	302 const DicomArray& query,
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	303 const std::list<DicomTag>& sequencesToReturn,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	304 const DicomMap* counters)
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	305 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	306 DicomMap match;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	307
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	308 if (dicomAsJson != NULL)
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	309 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	310 match.FromDicomAsJson(*dicomAsJson);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	311 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	312 else
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	313 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	314 match.Assign(mainDicomTags);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	315 }
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	316
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	317 DicomMap result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	318
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	319 for (size_t i = 0; i < query.GetSize(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	320 {
1346 911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	321 if (query.GetElement(i).GetTag() == DICOM_TAG_QUERY_RETRIEVE_LEVEL)
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	322 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	323 // Fix issue 30 on Google Code (QR response missing "Query/Retrieve Level" (008,0052))
1346 911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	324 result.SetValue(query.GetElement(i).GetTag(), query.GetElement(i).GetValue());
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	325 }
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	326 else if (query.GetElement(i).GetTag() == DICOM_TAG_SPECIFIC_CHARACTER_SET)
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	327 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	328 // Do not include the encoding, this is handled by class ParsedDicomFile
1346 911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	329 }
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	330 else
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	331 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	332 const DicomTag& tag = query.GetElement(i).GetTag();
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	333 const DicomValue* value = match.TestAndGetValue(tag);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	334
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	335 if (value != NULL &&
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	336 !value->IsNull() &&
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	337 !value->IsBinary())
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	338 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	339 result.SetValue(tag, value->GetContent(), false);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	340 }
722 3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	341 else
3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	342 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	343 result.SetValue(tag, "", false);
722 3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	344 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	345 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	346 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	347
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	348 if (counters != NULL)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	349 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	350 DicomArray tmp(*counters);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	351 for (size_t i = 0; i < tmp.GetSize(); i++)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	352 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	353 result.SetValue(tmp.GetElement(i).GetTag(), tmp.GetElement(i).GetValue().GetContent(), false);
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	354 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	355 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	356
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	357 if (result.GetSize() == 0 &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	358 sequencesToReturn.empty())
1331 77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	359 {
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	360 LOG(WARNING) << "The C-FIND request does not return any DICOM tag";
1331 77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	361 }
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	362 else if (sequencesToReturn.empty())
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	363 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	364 answers.Add(result);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	365 }
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	366 else if (dicomAsJson == NULL)
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	367 {
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	368 LOG(WARNING) << "C-FIND query requesting a sequence, but reading JSON from disk is disabled";
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	369 answers.Add(result);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	370 }
1331 77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	371 else
77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	372 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	373 ParsedDicomFile dicom(result);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	374
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	375 for (std::list<DicomTag>::const_iterator tag = sequencesToReturn.begin();
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	376 tag != sequencesToReturn.end(); ++tag)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	377 {
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	378 assert(dicomAsJson != NULL);
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	379 const Json::Value& source = (*dicomAsJson) [tag->Format()];
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	380
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	381 if (source.type() == Json::objectValue &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	382 source.isMember("Type") &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	383 source.isMember("Value") &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	384 source["Type"].asString() == "Sequence" &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	385 source["Value"].type() == Json::arrayValue)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	386 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	387 Json::Value content = Json::arrayValue;
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	388
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	389 for (Json::Value::ArrayIndex i = 0; i < source["Value"].size(); i++)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	390 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	391 Json::Value item;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	392 ServerToolbox::SimplifyTags(item, source["Value"][i], DicomToJsonFormat_Short);
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	393 content.append(item);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	394 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	395
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	396 dicom.Replace(*tag, content, false, DicomReplaceMode_InsertIfAbsent);
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	397 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	398 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	399
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	400 answers.Add(dicom);
1331 77e129ba64e4 Prevent freeze on C-FIND if no DICOM tag is to be returned Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	401 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	402 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	403
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	404
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	405
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	406 bool OrthancFindRequestHandler::FilterQueryTag(std::string& value /* can be modified */,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	407 ResourceType level,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	408 const DicomTag& tag,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	409 ModalityManufacturer manufacturer)
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	410 {
2335 174c3616ab6d code review Sebastien Jodogne <s.jodogne@gmail.com> parents: 2317 diff changeset	411 // Whatever the manufacturer, remove the GenericGroupLength tags
174c3616ab6d code review Sebastien Jodogne <s.jodogne@gmail.com> parents: 2317 diff changeset	412 // http://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_7.2.html
174c3616ab6d code review Sebastien Jodogne <s.jodogne@gmail.com> parents: 2317 diff changeset	413 // https://bitbucket.org/sjodogne/orthanc/issues/31/
2434 63194107e61b fix issue 31 for good: removing group length correctly amazy parents: 2382 diff changeset	414 if (tag.GetElement() == 0x0000)
2317 5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	415 {
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	416 return false;
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	417 }
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	418
1853 b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	419 switch (manufacturer)
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	420 {
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	421 case ModalityManufacturer_Vitrea:
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	422 // Following Denis Nesterov's mail on 2015-11-30
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	423 if (tag == DicomTag(0x5653, 0x0010)) // "PrivateCreator = Vital Images SW 3.4"
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	424 {
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	425 return false;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	426 }
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	427
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	428 break;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	429
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	430 default:
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	431 break;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	432 }
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	433
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	434 return true;
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	435 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	436
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	437
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	438 bool OrthancFindRequestHandler::ApplyLuaFilter(DicomMap& target,
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	439 const DicomMap& source,
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	440 const std::string& remoteIp,
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	441 const std::string& remoteAet,
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	442 const std::string& calledAet,
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	443 ModalityManufacturer manufacturer)
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	444 {
2221 e7beca979562 fix Windows build due to overwriting a macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	445 static const char* LUA_CALLBACK = "IncomingFindRequestFilter";
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	446
2617 912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	447 LuaScripting::Lock lock(context_.GetLuaScripting());
912a767911b0 back to a single Lua context Sebastien Jodogne <s.jodogne@gmail.com> parents: 2616 diff changeset	448
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	449 if (!lock.GetLua().IsExistingFunction(LUA_CALLBACK))
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	450 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	451 return false;
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	452 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	453 else
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	454 {
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	455 Json::Value origin;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	456 FormatOrigin(origin, remoteIp, remoteAet, calledAet, manufacturer);
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	457
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	458 LuaFunctionCall call(lock.GetLua(), LUA_CALLBACK);
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	459 call.PushDicom(source);
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	460 call.PushJson(origin);
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	461 FromDcmtkBridge::ExecuteToDicom(target, call);
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	462
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	463 return true;
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	464 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	465 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	466
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	467
2616 2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	468 OrthancFindRequestHandler::OrthancFindRequestHandler(ServerContext& context) :
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	469 context_(context),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	470 maxResults_(0),
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	471 maxInstances_(0)
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	472 {
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	473 }
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	474
2f3007bf0708 event queues in Lua, serialization of sequence of operations Sebastien Jodogne <s.jodogne@gmail.com> parents: 2612 diff changeset	475
3021 2cbafb5d5a62 renamed LookupResource::IVisitor as ServerContext::ILookupVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3015 diff changeset	476 class OrthancFindRequestHandler::LookupVisitor : public ServerContext::ILookupVisitor
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	477 {
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	478 private:
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	479 DicomFindAnswers& answers_;
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	480 ServerContext& context_;
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	481 ResourceType level_;
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	482 const DicomMap& query_;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	483 DicomArray queryAsArray_;
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	484 const std::list<DicomTag>& sequencesToReturn_;
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	485
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	486 public:
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	487 LookupVisitor(DicomFindAnswers& answers,
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	488 ServerContext& context,
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	489 ResourceType level,
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	490 const DicomMap& query,
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	491 const std::list<DicomTag>& sequencesToReturn) :
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	492 answers_(answers),
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	493 context_(context),
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	494 level_(level),
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	495 query_(query),
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	496 queryAsArray_(query),
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	497 sequencesToReturn_(sequencesToReturn)
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	498 {
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	499 answers_.SetComplete(false);
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	500 }
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	501
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	502 virtual bool IsDicomAsJsonNeeded() const
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	503 {
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	504 // Ask the "DICOM-as-JSON" attachment only if sequences are to
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	505 // be returned OR if "query_" contains non-main DICOM tags!
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	506
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	507 DicomMap withoutSpecialTags;
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	508 withoutSpecialTags.Assign(query_);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	509
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	510 // Check out "ComputeCounters()"
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	511 withoutSpecialTags.Remove(DICOM_TAG_MODALITIES_IN_STUDY);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	512 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	513 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	514 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	515 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	516 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	517 withoutSpecialTags.Remove(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	518 withoutSpecialTags.Remove(DICOM_TAG_SOP_CLASSES_IN_STUDY);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	519
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	520 // Check out "AddAnswer()"
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	521 withoutSpecialTags.Remove(DICOM_TAG_SPECIFIC_CHARACTER_SET);
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	522 withoutSpecialTags.Remove(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	523
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	524 return (!sequencesToReturn_.empty() \|\|
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	525 !withoutSpecialTags.HasOnlyMainDicomTags());
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	526 }
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	527
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	528 virtual void MarkAsComplete()
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	529 {
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	530 answers_.SetComplete(true);
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	531 }
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	532
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	533 virtual void Visit(const std::string& publicId,
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	534 const std::string& instanceId,
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	535 const DicomMap& mainDicomTags,
af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	536 const Json::Value* dicomAsJson)
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	537 {
3015 abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	538 std::auto_ptr<DicomMap> counters(ComputeCounters(context_, instanceId, level_, query_));
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	539
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	540 AddAnswer(answers_, mainDicomTags, dicomAsJson,
abe49ca61cd5 On C-FIND, avoid accessing the storage area whenever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 3012 diff changeset	541 queryAsArray_, sequencesToReturn_, counters.get());
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	542 }
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	543 };
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	544
5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	545
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	546 void OrthancFindRequestHandler::Handle(DicomFindAnswers& answers,
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	547 const DicomMap& input,
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	548 const std::list<DicomTag>& sequencesToReturn,
1573 3309878b3e16 more information about the origin of requests submitted to the DICOM handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1486 diff changeset	549 const std::string& remoteIp,
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1759 diff changeset	550 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	551 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	552 ModalityManufacturer manufacturer)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 {
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 /**
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	555 * Possibly apply the user-supplied Lua filter.
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	556 **/
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	557
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	558 DicomMap lua;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	559 const DicomMap* filteredInput = &input;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	560
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	561 if (ApplyLuaFilter(lua, input, remoteIp, remoteAet, calledAet, manufacturer))
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	562 {
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	563 filteredInput = &lua;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	564 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	565
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	566
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	567 /**
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 * Retrieve the query level.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	571 assert(filteredInput != NULL);
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	572 const DicomValue* levelTmp = filteredInput->TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	573 if (levelTmp == NULL \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	574 levelTmp->IsNull() \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	575 levelTmp->IsBinary())
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 {
2955 bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	577 throw OrthancException(ErrorCode_BadRequest,
bbfd95a0c429 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2940 diff changeset	578 "C-FIND request without the tag 0008,0052 (QueryRetrieveLevel)");
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	581 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	583 if (level != ResourceType_Patient &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	584 level != ResourceType_Study &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	585 level != ResourceType_Series &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	586 level != ResourceType_Instance)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	588 throw OrthancException(ErrorCode_NotImplemented);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	589 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	590
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	591
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	592 DicomArray query(*filteredInput);
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	593 LOG(INFO) << "DICOM C-Find request at level: " << EnumerationToString(level);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	594
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	595 for (size_t i = 0; i < query.GetSize(); i++)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	596 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	597 if (!query.GetElement(i).GetValue().IsNull())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	598 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	599 LOG(INFO) << " " << query.GetElement(i).GetTag()
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	600 << " " << FromDcmtkBridge::GetTagName(query.GetElement(i))
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	601 << " = " << query.GetElement(i).GetValue().GetContent();
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	602 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	605 for (std::list<DicomTag>::const_iterator it = sequencesToReturn.begin();
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	606 it != sequencesToReturn.end(); ++it)
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	607 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	608 LOG(INFO) << " (" << it->Format()
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	609 << ") " << FromDcmtkBridge::GetTagName(*it, "")
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	610 << " : sequence tag whose content will be copied";
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	611 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	612
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 /**
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	615 * Build up the query object.
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	616 **/
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	617
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	618 DatabaseLookup lookup;
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	619
2940 4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	620 bool caseSensitivePN;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	621
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	622 {
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	623 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	624 caseSensitivePN = lock.GetConfiguration().GetBooleanParameter("CaseSensitivePN", false);
4767d36679ed refactoring access to Orthanc configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2892 diff changeset	625 }
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	626
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	627 for (size_t i = 0; i < query.GetSize(); i++)
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	628 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	629 const DicomElement& element = query.GetElement(i);
a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	630 const DicomTag tag = element.GetTag();
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	631
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	632 if (element.GetValue().IsNull() \|\|
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	633 tag == DICOM_TAG_QUERY_RETRIEVE_LEVEL \|\|
94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	634 tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	635 {
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	636 continue;
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	637 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	638
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	639 std::string value = element.GetValue().GetContent();
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	640 if (value.size() == 0)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	641 {
3163 cf91b6f22278 Fix issue #90 (C-Find shall match missing tags to null/empty string) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3095 diff changeset	642 // An empty string corresponds to an universal constraint, so we ignore it
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	643 continue;
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	644 }
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	645
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	646 if (FilterQueryTag(value, level, tag, manufacturer))
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	647 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	648 ValueRepresentation vr = FromDcmtkBridge::LookupValueRepresentation(tag);
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	649
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	650 // DICOM specifies that searches must be case sensitive, except
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	651 // for tags with a PN value representation
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	652 bool sensitive = true;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	653 if (vr == ValueRepresentation_PersonName)
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	654 {
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	655 sensitive = caseSensitivePN;
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	656 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	657
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	658 lookup.AddDicomConstraint(tag, value, sensitive, true /* mandatory */);
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	659 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	660 else
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	661 {
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	662 LOG(INFO) << "Because of a patch for the manufacturer of the remote modality, "
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	663 << "ignoring constraint on tag (" << tag.Format() << ") " << FromDcmtkBridge::GetTagName(element);
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	664 }
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	665 }
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	666
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	667
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	668 /**
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	669 * Run the query.
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671
2876 ae8e72009e64 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 2827 diff changeset	672 size_t limit = (level == ResourceType_Instance) ? maxInstances_ : maxResults_;
941 83489fddd8c5 Options to limit the number of results for an incoming C-FIND query Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	673
3012 af1530b45290 Optimization: On finds, do not read JSON (disk) if main DICOM tags (DB) are sufficient Sebastien Jodogne <s.jodogne@gmail.com> parents: 3005 diff changeset	674
3003 5ae3ff2398e9 refactoring OrthancFindRequestHandler using LookupResource::IVisitor Sebastien Jodogne <s.jodogne@gmail.com> parents: 3001 diff changeset	675 LookupVisitor visitor(answers, context_, level, *filteredInput, sequencesToReturn);
3033 5da6d1063d8f effectively replacing LookupResource by DatabaseLookup in searches Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	676 context_.Apply(visitor, lookup, level, 0 /* "since" is not relevant to C-FIND */, limit);
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 }
2827 d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	678
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	679
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	680 void OrthancFindRequestHandler::FormatOrigin(Json::Value& origin,
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	681 const std::string& remoteIp,
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	682 const std::string& remoteAet,
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	683 const std::string& calledAet,
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	684 ModalityManufacturer manufacturer)
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	685 {
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	686 origin = Json::objectValue;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	687 origin["RemoteIp"] = remoteIp;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	688 origin["RemoteAet"] = remoteAet;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	689 origin["CalledAet"] = calledAet;
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	690 origin["Manufacturer"] = EnumerationToString(manufacturer);
d4fd4614f275 IncomingWorklistRequestFilter() to filter incoming C-FIND worklist queries Sebastien Jodogne <s.jodogne@gmail.com> parents: 2617 diff changeset	691 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 3163:cf91b6f22278