orthanc: OrthancServer/OrthancFindRequestHandler.cpp annotate

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 2364:ae50eccd41b7

compilation succeeds on OpenBSD

author	jodogne
date	Mon, 21 Aug 2017 16:28:53 +0200
parents	174c3616ab6d
children	7284093111b0

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
2244 a3a65de1840f shared copyright with osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 2221 diff changeset	5 * Copyright (C) 2017 Osimis, 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"
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	38 #include "../Core/Lua/LuaFunctionCall.h"
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	39 #include "../Core/Logging.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 722 diff changeset	40 #include "FromDcmtkBridge.h"
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	41 #include "OrthancInitialization.h"
1751 fb569ee09a69 LookupResource complete Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	42 #include "Search/LookupResource.h"
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	43 #include "ServerToolbox.h"
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	44
1486 f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	45 #include <boost/regex.hpp>
f967bdf8534e refactoring to Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 1429 diff changeset	46
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	47
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	48 namespace Orthanc
94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	49 {
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	50 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	51 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	52 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	53 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	54 target.clear();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	55
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	56 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	57 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	58 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	59 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	60 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	61 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	62 }
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 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	67 const DicomTag& tag,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	68 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	69 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	70 bool isFirst = true;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	71
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	72 std::string s;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	73 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	74 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	75 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	76 if (isFirst)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	77 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	78 isFirst = false;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	79 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	80 else
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	81 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	82 s += "\\";
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	83 }
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 s += *it;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	86 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	87
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	88 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	89 }
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 static void ExtractTagFromMainDicomTags(std::set<std::string>& target,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	93 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	94 const DicomTag& tag,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	95 const std::list<std::string>& resources,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	96 ResourceType level)
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 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	99 it = resources.begin(); it != resources.end(); ++it)
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 DicomMap tags;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	102 if (index.GetMainDicomTags(tags, *it, level, level) &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	103 tags.HasTag(tag))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	104 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	105 target.insert(tags.GetValue(tag).GetContent());
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 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	108 }
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
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	111 static bool ExtractMetadata(std::set<std::string>& target,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	112 ServerIndex& index,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	113 MetadataType metadata,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	114 const std::list<std::string>& resources)
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	115 {
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	116 for (std::list<std::string>::const_iterator
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	117 it = resources.begin(); it != resources.end(); ++it)
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	118 {
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	119 std::string value;
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	120 if (index.LookupMetadata(value, *it, metadata))
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	121 {
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	122 target.insert(value);
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	123 }
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	124 else
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	125 {
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	126 // This metadata is unavailable for some resource, give up
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	127 return false;
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	128 }
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	129 }
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	130
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	131 return true;
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	132 }
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	133
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	134
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	135 static void ExtractTagFromInstancesOnDisk(std::set<std::string>& target,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	136 ServerContext& context,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	137 const DicomTag& tag,
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	138 const std::list<std::string>& instances)
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	139 {
2039 e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	140 // WARNING: This function is slow, as it reads the JSON file
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	141 // summarizing each instance of interest from the hard drive.
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	142
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	143 std::string formatted = tag.Format();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	144
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	145 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	146 it = instances.begin(); it != instances.end(); ++it)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	147 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	148 Json::Value dicom;
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	149 context.ReadDicomAsJson(dicom, *it);
1898 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 if (dicom.isMember(formatted))
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	152 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	153 const Json::Value& source = dicom[formatted];
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 (source.type() == Json::objectValue &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	156 source.isMember("Type") &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	157 source.isMember("Value") &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	158 source["Type"].asString() == "String" &&
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	159 source["Value"].type() == Json::stringValue)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	160 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	161 target.insert(source["Value"].asString());
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	162 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	163 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	164 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	165 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	166
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	167
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	168 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	169 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	170 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	171 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	172 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	173 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	174 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	175
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	176 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	177 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	178 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_STUDIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	179 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	180 }
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 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	183 !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	184 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	185 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	186 }
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 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	189 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	190 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	191
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	192 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	193 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	194 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_SERIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	195 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	196 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	197
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	198 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	199 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	200 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	201 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	202
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	203 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	204 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	205
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	206 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	207 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	208 result.SetValue(DICOM_TAG_NUMBER_OF_PATIENT_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	209 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	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
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	214 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	215 ServerContext& context,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	216 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	217 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	218 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	219 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	220
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	221 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	222 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	223
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	224 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	225 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	226 result.SetValue(DICOM_TAG_NUMBER_OF_STUDY_RELATED_SERIES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	227 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	228 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	229
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	230 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	231 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	232 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	233 ExtractTagFromMainDicomTags(values, index, DICOM_TAG_MODALITY, series, ResourceType_Series);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	234 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	235 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	236
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_STUDY_RELATED_INSTANCES) &&
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_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	239 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	240 return;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	241 }
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 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	244 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	245
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	246 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	247 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	248 result.SetValue(DICOM_TAG_NUMBER_OF_STUDY_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	249 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	250 }
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 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	253 {
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	254 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	255
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	256 if (ExtractMetadata(values, index, MetadataType_Instance_SopClassUid, instances))
2039 e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	257 {
2208 90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	258 // The metadata "SopClassUid" is available for each of these instances
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	259 StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values);
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	260 }
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	261 else if (Configuration::GetGlobalBoolParameter("AllowFindSopClassesInStudy", false))
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	262 {
90ea60bee5ff New metadata automatically computed at the instance level: "SopClassUid" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2124 diff changeset	263 ExtractTagFromInstancesOnDisk(values, context, DICOM_TAG_SOP_CLASS_UID, instances);
2039 e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	264 StoreSetOfStrings(result, DICOM_TAG_SOP_CLASSES_IN_STUDY, values);
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	265 }
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	266 else
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	267 {
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	268 result.SetValue(DICOM_TAG_SOP_CLASSES_IN_STUDY, "", false);
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	269 LOG(WARNING) << "The handling of \"SOP Classes in Study\" (0008,0062) "
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	270 << "in C-FIND requests is disabled";
e33e0ae51d7b new configuration option AllowFindSopClassesInStudy Sebastien Jodogne <s.jodogne@gmail.com> parents: 2007 diff changeset	271 }
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	272 }
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
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	276 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	277 ServerIndex& index,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	278 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	279 const DicomMap& query)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	280 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	281 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	282 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	283
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	284 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	285 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	286 result.SetValue(DICOM_TAG_NUMBER_OF_SERIES_RELATED_INSTANCES,
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	287 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	288 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	289 }
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
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	292 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	293 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	294 ResourceType level,
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	295 const DicomMap& query)
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 switch (level)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	298 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	299 case ResourceType_Patient:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	300 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	301 !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	302 !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	303 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	304 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	305 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	306
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	307 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	308
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	309 case ResourceType_Study:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	310 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	311 !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	312 !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	313 !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	314 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	315 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	316 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	317
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	318 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	319
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	320 case ResourceType_Series:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	321 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	322 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	323 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	324 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	325
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	326 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	327
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	328 default:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	329 return NULL;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	330 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	331
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	332 std::string parent;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	333 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	334 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	335 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	336 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	337
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	338 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	339
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	340 switch (level)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	341 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	342 case ResourceType_Patient:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	343 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	344 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	345
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	346 case ResourceType_Study:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	347 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	348 break;
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 case ResourceType_Series:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	351 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	352 break;
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	353
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	354 default:
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	355 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	356 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	357
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	358 return result.release();
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	359 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	360
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	361
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	362 static void AddAnswer(DicomFindAnswers& answers,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	363 const Json::Value& resource,
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	364 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	365 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	366 const DicomMap* counters)
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	367 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	368 DicomMap result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	369
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	370 for (size_t i = 0; i < query.GetSize(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	371 {
1346 911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	372 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	373 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	374 // 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	375 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	376 }
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	377 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	378 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	379 // 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	380 }
911a1ad5ebe8 re-fix issue 30 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1332 diff changeset	381 else
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	382 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	383 std::string tag = query.GetElement(i).GetTag().Format();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	384 std::string value;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	385 if (resource.isMember(tag))
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	386 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	387 value = resource.get(tag, Json::arrayValue).get("Value", "").asString();
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	388 result.SetValue(query.GetElement(i).GetTag(), value, false);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	389 }
722 3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	390 else
3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	391 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	392 result.SetValue(query.GetElement(i).GetTag(), "", false);
722 3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	393 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	394 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	395 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	396
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	397 if (counters != NULL)
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	398 {
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	399 DicomArray tmp(*counters);
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	400 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	401 {
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	402 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	403 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	404 }
e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	405
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	406 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	407 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	408 {
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	409 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	410 }
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	411 else if (sequencesToReturn.empty())
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	412 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	413 answers.Add(result);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	414 }
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	415 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	416 {
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	417 ParsedDicomFile dicom(result);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	418
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	419 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	420 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	421 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	422 const Json::Value& source = resource[tag->Format()];
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	423
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	424 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	425 source.isMember("Type") &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	426 source.isMember("Value") &&
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	427 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	428 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	429 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	430 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	431
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	432 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	433 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	434 Json::Value item;
2120 4b02ec79728a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2115 diff changeset	435 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	436 content.append(item);
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	437 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	438
1982 b5d4f9c156ad Modification of instances can now replace PixelData Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	439 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	440 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	441 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	442
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	443 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	444 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	445 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	446
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	447
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	448
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	449 bool OrthancFindRequestHandler::FilterQueryTag(std::string& value /* can be modified */,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	450 ResourceType level,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	451 const DicomTag& tag,
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	452 ModalityManufacturer manufacturer)
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	453 {
2335 174c3616ab6d code review Sebastien Jodogne <s.jodogne@gmail.com> parents: 2317 diff changeset	454 // Whatever the manufacturer, remove the GenericGroupLength tags
174c3616ab6d code review Sebastien Jodogne <s.jodogne@gmail.com> parents: 2317 diff changeset	455 // 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	456 // https://bitbucket.org/sjodogne/orthanc/issues/31/
2317 5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	457 if (tag.GetGroup() == 0x0000)
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	458 {
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	459 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	460 }
5b7556568fa4 Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless amazy parents: 2256 diff changeset	461
1853 b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	462 switch (manufacturer)
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	463 {
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	464 case ModalityManufacturer_Vitrea:
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	465 // 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	466 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	467 {
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	468 return false;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	469 }
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	470
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	471 break;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	472
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	473 default:
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	474 break;
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	475 }
b7d3d3b182cf two patches for manufacturers Efilm and Vitrea Sebastien Jodogne <s.jodogne@gmail.com> parents: 1851 diff changeset	476
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	477 return true;
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	478 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	479
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	480
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	481 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	482 const DicomMap& source,
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	483 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	484 const std::string& remoteAet,
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	485 const std::string& calledAet)
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	486 {
2221 e7beca979562 fix Windows build due to overwriting a macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	487 static const char* LUA_CALLBACK = "IncomingFindRequestFilter";
e7beca979562 fix Windows build due to overwriting a macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	488
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	489 LuaScripting::Locker locker(context_.GetLua());
2221 e7beca979562 fix Windows build due to overwriting a macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	490 if (!locker.GetLua().IsExistingFunction(LUA_CALLBACK))
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	491 {
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	492 return false;
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	493 }
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	494 else
3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	495 {
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	496 Json::Value origin = Json::objectValue;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	497 origin["RemoteIp"] = remoteIp;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	498 origin["RemoteAet"] = remoteAet;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	499 origin["CalledAet"] = calledAet;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	500
2221 e7beca979562 fix Windows build due to overwriting a macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 2218 diff changeset	501 LuaFunctionCall call(locker.GetLua(), LUA_CALLBACK);
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	502 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	503 call.PushJson(origin);
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	504 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	505
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	506 return true;
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	507 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	508 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	509
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	510
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	511 void OrthancFindRequestHandler::Handle(DicomFindAnswers& answers,
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	512 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	513 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	514 const std::string& remoteIp,
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1759 diff changeset	515 const std::string& remoteAet,
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	516 const std::string& calledAet,
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	517 ModalityManufacturer manufacturer)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 {
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 /**
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	520 * 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	521 **/
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	522
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	523 DicomMap lua;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	524 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	525
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	526 if (ApplyLuaFilter(lua, input, remoteIp, remoteAet, calledAet))
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	527 {
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	528 filteredInput = &lua;
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	529 }
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	530
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	531
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	532 /**
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533 * Retrieve the query level.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	536 assert(filteredInput != NULL);
512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	537 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	538 if (levelTmp == NULL \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	539 levelTmp->IsNull() \|\|
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	540 levelTmp->IsBinary())
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 {
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	542 LOG(ERROR) << "C-FIND request without the tag 0008,0052 (QueryRetrieveLevel)";
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 throw OrthancException(ErrorCode_BadRequest);
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	546 ResourceType level = StringToResourceType(levelTmp->GetContent().c_str());
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	548 if (level != ResourceType_Patient &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	549 level != ResourceType_Study &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	550 level != ResourceType_Series &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	551 level != ResourceType_Instance)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	553 throw OrthancException(ErrorCode_NotImplemented);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	554 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	555
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	556
1888 512b6e76f531 Lua: "IncomingFindRequestFilter()" to apply filters to incoming C-Find requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1859 diff changeset	557 DicomArray query(*filteredInput);
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	558 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	559
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	560 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	561 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	562 if (!query.GetElement(i).GetValue().IsNull())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	563 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	564 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	565 << " " << FromDcmtkBridge::GetTagName(query.GetElement(i))
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1582 diff changeset	566 << " = " << query.GetElement(i).GetValue().GetContent();
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	567 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569
1859 4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	570 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	571 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	572 {
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	573 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	574 << ") " << 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	575 << " : 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	576 }
4e7c318a3f69 C-FIND SCP will return tags with sequence value representation Sebastien Jodogne <s.jodogne@gmail.com> parents: 1856 diff changeset	577
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 /**
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	580 * Build up the query object.
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	581 **/
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	582
1751 fb569ee09a69 LookupResource complete Sebastien Jodogne <s.jodogne@gmail.com> parents: 1737 diff changeset	583 LookupResource finder(level);
1759 e268412adcf1 removal of old implementation of search Sebastien Jodogne <s.jodogne@gmail.com> parents: 1758 diff changeset	584
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	585 const bool caseSensitivePN = Configuration::GetGlobalBoolParameter("CaseSensitivePN", false);
de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	586
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	587 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	588 {
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	589 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	590 const DicomTag tag = element.GetTag();
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	591
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	592 if (element.GetValue().IsNull() \|\|
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	593 tag == DICOM_TAG_QUERY_RETRIEVE_LEVEL \|\|
94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	594 tag == DICOM_TAG_SPECIFIC_CHARACTER_SET)
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	595 {
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	596 continue;
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	597 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	598
2115 a657f7772e69 Handling of private tags/creators in the "Dictionary" configuration option Sebastien Jodogne <s.jodogne@gmail.com> parents: 2088 diff changeset	599 std::string value = element.GetValue().GetContent();
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	600 if (value.size() == 0)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	601 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	602 // An empty string corresponds to a "*" wildcard constraint, so we ignore it
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	603 continue;
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1383 diff changeset	604 }
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	605
2256 de1ba22fd28a simplification wrt. modality manufacturers Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	606 if (FilterQueryTag(value, level, tag, manufacturer))
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	607 {
2006 6301bbcbcaed more generic support of value representations Sebastien Jodogne <s.jodogne@gmail.com> parents: 1982 diff changeset	608 ValueRepresentation vr = FromDcmtkBridge::LookupValueRepresentation(tag);
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	609
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	610 // DICOM specifies that searches must be case sensitive, except
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	611 // for tags with a PN value representation
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	612 bool sensitive = true;
2007 655489d9165d DicomMap::ParseDicomMetaInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 2006 diff changeset	613 if (vr == ValueRepresentation_PersonName)
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	614 {
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	615 sensitive = caseSensitivePN;
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	616 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	617
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	618 finder.AddDicomConstraint(tag, value, sensitive);
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	619 }
d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	620 else
1758 318c2e83c2bd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1757 diff changeset	621 {
1851 d364926389e0 OrthancFindRequestHandler::FilterQueryTag Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	622 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	623 << "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	624 }
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	625 }
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	626
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	627
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	628 /**
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	629 * Run the query.
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	632 size_t maxResults = (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	633
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	634 std::vector<std::string> resources, instances;
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	635 context_.GetIndex().FindCandidates(resources, instances, finder);
1752 c3d8ec63a179 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1751 diff changeset	636
2088 b9428d5f7eaf Fix serious performance issue with C-FIND Sebastien Jodogne <s.jodogne@gmail.com> parents: 2039 diff changeset	637 LOG(INFO) << "Number of candidate resources after fast DB filtering: " << resources.size();
b9428d5f7eaf Fix serious performance issue with C-FIND Sebastien Jodogne <s.jodogne@gmail.com> parents: 2039 diff changeset	638
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	639 assert(resources.size() == instances.size());
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	640 bool complete = true;
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	641
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	642 for (size_t i = 0; i < instances.size(); i++)
1752 c3d8ec63a179 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1751 diff changeset	643 {
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	644 Json::Value dicom;
2124 2b1520efa282 cleaning up Sebastien Jodogne <s.jodogne@gmail.com> parents: 2120 diff changeset	645 context_.ReadDicomAsJson(dicom, instances[i]);
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	646
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	647 if (finder.IsMatch(dicom))
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	648 {
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	649 if (maxResults != 0 &&
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	650 answers.GetSize() >= maxResults)
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	651 {
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	652 complete = false;
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	653 break;
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	654 }
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	655 else
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	656 {
2218 3eefb84ac0bd dynamically fix outgoing C-Find requests using "OutgoingFindRequestFilter()" Sebastien Jodogne <s.jodogne@gmail.com> parents: 2208 diff changeset	657 std::auto_ptr<DicomMap> counters(ComputeCounters(context_, instances[i], level, *filteredInput));
1898 e018037d4d0e Support of optional tags for counting resources in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 1893 diff changeset	658 AddAnswer(answers, dicom, query, sequencesToReturn, counters.get());
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	659 }
faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	660 }
1752 c3d8ec63a179 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1751 diff changeset	661 }
c3d8ec63a179 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1751 diff changeset	662
1753 faf2ecab3472 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1752 diff changeset	663 LOG(INFO) << "Number of matching resources: " << answers.GetSize();
1361 94ffb597d297 refactoring of C-Find SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 1354 diff changeset	664
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	665 answers.SetComplete(complete);
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 }

Mercurial > hg > orthanc

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 2364:ae50eccd41b7