orthanc: OrthancServer/OrthancFindRequestHandler.cpp annotate

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 846:715ab7674993 jpeg

refactoring

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 05 Jun 2014 16:23:03 +0200
parents	84513f2ee1f3
children	83489fddd8c5

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
689 2d0a347e8cfc switch to 2014 Sebastien Jodogne <s.jodogne@gmail.com> parents: 682 diff changeset	3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege,
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Belgium
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * 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	7 * 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	8 * 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	9 * License, or (at your option) any later version.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * 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	12 * 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	13 * 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	14 * 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	15 * 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	16 * 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	17 * 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	18 * 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	19 * 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	20 * 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	21 * in the program, then also delete it here.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * 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	29 * 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	30 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
824 a811bdf8b8eb precompiled headers Sebastien Jodogne <s.jodogne@gmail.com> parents: 810 diff changeset	32
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	33 #include "PrecompiledHeadersServer.h"
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "OrthancFindRequestHandler.h"
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <glog/logging.h>
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	37 #include <boost/regex.hpp>
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "../Core/DicomFormat/DicomArray.h"
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	40 #include "ServerToolbox.h"
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	41 #include "OrthancInitialization.h"
795 d466b3606aca refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 722 diff changeset	42 #include "FromDcmtkBridge.h"
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 namespace Orthanc
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 {
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	46 static bool IsWildcard(const std::string& constraint)
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	47 {
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	48 return (constraint.find('-') != std::string::npos \|\|
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	49 constraint.find('*') != std::string::npos \|\|
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	50 constraint.find('\\') != std::string::npos \|\|
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	51 constraint.find('?') != std::string::npos);
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	52 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	53
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	54 static bool ApplyRangeConstraint(const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	55 const std::string& constraint)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	56 {
610 5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	57 size_t separator = constraint.find('-');
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	58 std::string lower, upper, v;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	59 Toolbox::ToLowerCase(lower, constraint.substr(0, separator));
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	60 Toolbox::ToLowerCase(upper, constraint.substr(separator + 1));
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	61 Toolbox::ToLowerCase(v, value);
610 5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	62
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	63 if (lower.size() == 0 && upper.size() == 0)
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	64 {
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	65 return false;
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	66 }
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	67
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	68 if (lower.size() == 0)
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	69 {
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	70 return v <= upper;
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	71 }
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	72
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	73 if (upper.size() == 0)
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	74 {
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	75 return v >= lower;
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	76 }
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	77
5ba825b87b21 fix static build Sebastien Jodogne <s.jodogne@gmail.com> parents: 608 diff changeset	78 return (v >= lower && v <= upper);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	79 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	80
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	81
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	82 static bool ApplyListConstraint(const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	83 const std::string& constraint)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	84 {
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	85 std::string v1;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	86 Toolbox::ToLowerCase(v1, value);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	87
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	88 std::vector<std::string> items;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	89 Toolbox::TokenizeString(items, constraint, '\\');
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	90
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	91 for (size_t i = 0; i < items.size(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	92 {
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	93 std::string lower;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	94 Toolbox::ToLowerCase(lower, items[i]);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	95 if (lower == v1)
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	96 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	97 return true;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	98 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	99 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	100
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	101 return false;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	102 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	103
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	104
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	105 static bool Matches(const std::string& value,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	106 const std::string& constraint)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	107 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	108 // http://www.itk.org/Wiki/DICOM_QueryRetrieve_Explained
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	109 // http://dicomiseasy.blogspot.be/2012/01/dicom-queryretrieve-part-i.html
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	110
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	111 if (constraint.find('-') != std::string::npos)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	112 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	113 return ApplyRangeConstraint(value, constraint);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	114 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	115
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	116 if (constraint.find('\\') != std::string::npos)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	117 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	118 return ApplyListConstraint(value, constraint);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	119 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	120
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	121 if (constraint.find('*') != std::string::npos \|\|
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	122 constraint.find('?') != std::string::npos)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	123 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	124 // TODO - Cache the constructed regular expression
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	125 boost::regex pattern(Toolbox::WildcardToRegularExpression(constraint),
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	126 boost::regex::icase /* case insensitive search */);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	127 return boost::regex_match(value, pattern);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	128 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	129 else
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	130 {
690 2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	131 std::string v, c;
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	132 Toolbox::ToLowerCase(v, value);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	133 Toolbox::ToLowerCase(c, constraint);
2e67366aab83 case-insensitive matching of Application Entity Titles Sebastien Jodogne <s.jodogne@gmail.com> parents: 689 diff changeset	134 return v == c;
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	135 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	136 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	137
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	138
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	139 static bool LookupOneInstance(std::string& result,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	140 ServerIndex& index,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	141 const std::string& id,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	142 ResourceType type)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	143 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	144 if (type == ResourceType_Instance)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	145 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	146 result = id;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	147 return true;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	148 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	149
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	150 std::string childId;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	151
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	152 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	153 std::list<std::string> children;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	154 index.GetChildInstances(children, id);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	155
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 618 diff changeset	156 if (children.empty())
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	157 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	158 return false;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	159 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	160
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	161 childId = children.front();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	162 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	163
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	164 return LookupOneInstance(result, index, childId, GetChildResourceType(type));
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	165 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	166
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	167
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	168 static bool Matches(const Json::Value& resource,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	169 const DicomArray& query)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	170 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	171 for (size_t i = 0; i < query.GetSize(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	172 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	173 if (query.GetElement(i).GetValue().IsNull() \|\|
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	174 query.GetElement(i).GetTag() == DICOM_TAG_QUERY_RETRIEVE_LEVEL \|\|
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	175 query.GetElement(i).GetTag() == DICOM_TAG_SPECIFIC_CHARACTER_SET \|\|
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	176 query.GetElement(i).GetTag() == DICOM_TAG_MODALITIES_IN_STUDY)
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	177 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	178 continue;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	179 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	180
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	181 std::string tag = query.GetElement(i).GetTag().Format();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	182 std::string value;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	183 if (resource.isMember(tag))
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	184 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	185 value = resource.get(tag, Json::arrayValue).get("Value", "").asString();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	186 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	187
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	188 if (!Matches(value, query.GetElement(i).GetValue().AsString()))
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	189 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	190 return false;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	191 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	192 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	193
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	194 return true;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	195 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	196
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	197
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	198 static void AddAnswer(DicomFindAnswers& answers,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	199 const Json::Value& resource,
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	200 const DicomArray& query)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	201 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	202 DicomMap result;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	203
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	204 for (size_t i = 0; i < query.GetSize(); i++)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	205 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	206 if (query.GetElement(i).GetTag() != DICOM_TAG_QUERY_RETRIEVE_LEVEL &&
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	207 query.GetElement(i).GetTag() != DICOM_TAG_SPECIFIC_CHARACTER_SET)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	208 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	209 std::string tag = query.GetElement(i).GetTag().Format();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	210 std::string value;
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	211 if (resource.isMember(tag))
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	212 {
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	213 value = resource.get(tag, Json::arrayValue).get("Value", "").asString();
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	214 result.SetValue(query.GetElement(i).GetTag(), value);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	215 }
722 3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	216 else
3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	217 {
3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	218 result.SetValue(query.GetElement(i).GetTag(), "");
3596177682a9 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 716 diff changeset	219 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	220 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	221 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	222
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	223 answers.Add(result);
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	224 }
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	225
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	226
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	227 static bool ApplyModalitiesInStudyFilter(std::list<std::string>& filteredStudies,
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	228 const std::list<std::string>& studies,
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	229 const DicomMap& input,
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	230 ServerIndex& index)
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	231 {
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	232 filteredStudies.clear();
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	233
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	234 const DicomValue& v = input.GetValue(DICOM_TAG_MODALITIES_IN_STUDY);
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	235 if (v.IsNull())
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	236 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	237 return false;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	238 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	239
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	240 // Move the allowed modalities into a "std::set"
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	241 std::vector<std::string> tmp;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	242 Toolbox::TokenizeString(tmp, v.AsString(), '\\');
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	243
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	244 std::set<std::string> modalities;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	245 for (size_t i = 0; i < tmp.size(); i++)
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	246 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	247 modalities.insert(tmp[i]);
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	248 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	249
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	250 // Loop over the studies
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	251 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 618 diff changeset	252 it = studies.begin(); it != studies.end(); ++it)
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	253 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	254 try
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	255 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	256 // We are considering a single study. Check whether one of
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	257 // its child series matches one of the modalities.
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	258 Json::Value study;
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	259 if (index.LookupResource(study, *it, ResourceType_Study))
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	260 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	261 // Loop over the series of the considered study.
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	262 for (Json::Value::ArrayIndex j = 0; j < study["Series"].size(); j++) // (*)
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	263 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	264 Json::Value series;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	265 if (index.LookupResource(series, study["Series"][j].asString(), ResourceType_Series))
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	266 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	267 // Get the modality of this series
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	268 if (series["MainDicomTags"].isMember("Modality"))
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	269 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	270 std::string modality = series["MainDicomTags"]["Modality"].asString();
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	271 if (modalities.find(modality) != modalities.end())
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	272 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	273 // This series of the considered study matches one
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	274 // of the required modalities. Take the study into
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	275 // consideration for future filtering.
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	276 filteredStudies.push_back(*it);
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	277
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	278 // We have finished considering this study. Break the study loop at (*).
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	279 break;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	280 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	281 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	282 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	283 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	284 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	285 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	286 catch (OrthancException&)
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	287 {
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	288 // This resource has probably been deleted during the find request
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	289 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	290 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	291
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	292 return true;
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	293 }
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	294
fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	295
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	296 namespace
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	297 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	298 class CandidateResources
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	299 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	300 private:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	301 ServerIndex& index_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	302 ModalityManufacturer manufacturer_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	303 ResourceType level_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	304 bool isFilterApplied_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	305 std::set<std::string> filtered_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	306
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	307 static void ListToSet(std::set<std::string>& target,
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	308 const std::list<std::string>& source)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	309 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	310 for (std::list<std::string>::const_iterator
716 cf6e761e7da5 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	311 it = source.begin(); it != source.end(); ++it)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	312 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	313 target.insert(*it);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	314 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	315 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	316
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	317 void ApplyExactFilter(const DicomTag& tag, const std::string& value)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	318 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	319 LOG(INFO) << "Applying exact filter on tag "
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	320 << FromDcmtkBridge::GetName(tag) << " (value: " << value << ")";
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	321
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	322 std::list<std::string> resources;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	323 index_.LookupTagValue(resources, tag, value, level_);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	324
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	325 if (isFilterApplied_)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	326 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	327 std::set<std::string> s;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	328 ListToSet(s, resources);
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	329
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	330 std::set<std::string> tmp = filtered_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	331 filtered_.clear();
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	332
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	333 for (std::set<std::string>::const_iterator
716 cf6e761e7da5 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	334 it = tmp.begin(); it != tmp.end(); ++it)
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	335 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	336 if (s.find(*it) != s.end())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	337 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	338 filtered_.insert(*it);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	339 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	340 }
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	341 }
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	342 else
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	343 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	344 assert(filtered_.empty());
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	345 isFilterApplied_ = true;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	346 ListToSet(filtered_, resources);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	347 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	348 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	349
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	350 public:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	351 CandidateResources(ServerIndex& index,
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	352 ModalityManufacturer manufacturer) :
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	353 index_(index),
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	354 manufacturer_(manufacturer),
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	355 level_(ResourceType_Patient),
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	356 isFilterApplied_(false)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	357 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	358 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	359
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	360 ResourceType GetLevel() const
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	361 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	362 return level_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	363 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	364
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	365 void GoDown()
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	366 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	367 assert(level_ != ResourceType_Instance);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	368
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	369 if (isFilterApplied_)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	370 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	371 std::set<std::string> tmp = filtered_;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	372
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	373 filtered_.clear();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	374
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	375 for (std::set<std::string>::const_iterator
716 cf6e761e7da5 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	376 it = tmp.begin(); it != tmp.end(); ++it)
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	377 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	378 std::list<std::string> children;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	379 index_.GetChildren(children, *it);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	380 ListToSet(filtered_, children);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	381 }
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	382 }
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	383
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	384 switch (level_)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	385 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	386 case ResourceType_Patient:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	387 level_ = ResourceType_Study;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	388 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	389
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	390 case ResourceType_Study:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	391 level_ = ResourceType_Series;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	392 break;
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	393
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	394 case ResourceType_Series:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	395 level_ = ResourceType_Instance;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	396 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	397
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	398 default:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	399 throw OrthancException(ErrorCode_InternalError);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	400 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	401 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	402
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	403 void Flatten(std::list<std::string>& resources) const
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	404 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	405 resources.clear();
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	406
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	407 if (isFilterApplied_)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	408 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	409 for (std::set<std::string>::const_iterator
716 cf6e761e7da5 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 714 diff changeset	410 it = filtered_.begin(); it != filtered_.end(); ++it)
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	411 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	412 resources.push_back(*it);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	413 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	414 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	415 else
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	416 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	417 Json::Value tmp;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	418 index_.GetAllUuids(tmp, level_);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	419 for (Json::Value::ArrayIndex i = 0; i < tmp.size(); i++)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	420 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	421 resources.push_back(tmp[i].asString());
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	422 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	423 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	424 }
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	425
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	426 void ApplyFilter(const DicomTag& tag, const DicomMap& query)
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	427 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	428 if (query.HasTag(tag))
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	429 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	430 const DicomValue& value = query.GetValue(tag);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	431 if (!value.IsNull())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	432 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	433 std::string value = query.GetValue(tag).AsString();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	434 if (!IsWildcard(value))
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	435 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	436 ApplyExactFilter(tag, value);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	437 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	438 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	439 }
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	440 }
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	441 };
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	442 }
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	443
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	444
618 5ab377df6d8b filtering on aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 615 diff changeset	445 void OrthancFindRequestHandler::Handle(DicomFindAnswers& answers,
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	446 const DicomMap& input,
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	447 const std::string& callingAETitle)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 {
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 /**
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	450 * Retrieve the manufacturer of this modality.
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	451 **/
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	452
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	453 ModalityManufacturer manufacturer;
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	454
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	455 {
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	456 RemoteModalityParameters modality;
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	457
810 401a9633e492 configuration into a namespace Sebastien Jodogne <s.jodogne@gmail.com> parents: 806 diff changeset	458 if (!Configuration::LookupDicomModalityUsingAETitle(modality, callingAETitle))
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	459 {
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	460 throw OrthancException("Unknown modality");
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	461 }
806 557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	462
557575fd93e9 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 795 diff changeset	463 manufacturer = modality.GetManufacturer();
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	464 }
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	465
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	466
41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	467 /**
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 * Retrieve the query level.
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 **/
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL);
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 if (levelTmp == NULL)
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 {
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 throw OrthancException(ErrorCode_BadRequest);
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 ResourceType level = StringToResourceType(levelTmp->AsString().c_str());
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	479 if (level != ResourceType_Patient &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	480 level != ResourceType_Study &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	481 level != ResourceType_Series &&
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	482 level != ResourceType_Instance)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 {
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	484 throw OrthancException(ErrorCode_NotImplemented);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	485 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	486
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 656 diff changeset	487
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	488 DicomArray query(input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	489 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	490
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	491 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	492 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	493 if (!query.GetElement(i).GetValue().IsNull())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	494 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	495 LOG(INFO) << " " << query.GetElement(i).GetTag()
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	496 << " " << FromDcmtkBridge::GetName(query.GetElement(i).GetTag())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	497 << " = " << query.GetElement(i).GetValue().AsString();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	498 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 /**
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	503 * Retrieve the candidate resources for this query level. Whenever
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	504 * possible, we avoid returning ALL the resources for this query
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	505 * level, as it would imply reading the JSON file on the harddisk
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	506 * for each of them.
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	507 **/
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	508
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	509 CandidateResources candidates(context_.GetIndex(), manufacturer);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	510
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	511 for (;;)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	512 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	513 switch (candidates.GetLevel())
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	514 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	515 case ResourceType_Patient:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	516 candidates.ApplyFilter(DICOM_TAG_PATIENT_ID, input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	517 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	518
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	519 case ResourceType_Study:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	520 candidates.ApplyFilter(DICOM_TAG_STUDY_INSTANCE_UID, input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	521 candidates.ApplyFilter(DICOM_TAG_ACCESSION_NUMBER, input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	522 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	523
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	524 case ResourceType_Series:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	525 candidates.ApplyFilter(DICOM_TAG_SERIES_INSTANCE_UID, input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	526 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	527
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	528 case ResourceType_Instance:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	529 candidates.ApplyFilter(DICOM_TAG_SOP_INSTANCE_UID, input);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	530 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	531
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	532 default:
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	533 throw OrthancException(ErrorCode_InternalError);
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	534 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	535
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	536 if (candidates.GetLevel() == level)
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	537 {
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	538 break;
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	539 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	540
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	541 candidates.GoDown();
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	542 }
6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	543
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	544 std::list<std::string> resources;
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	545 candidates.Flatten(resources);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	546
714 6a1dbba0cca7 new implementation of C-Find handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	547 LOG(INFO) << "Number of candidate resources after exact filtering: " << resources.size();
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	548
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	549 /**
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	550 * Apply filtering on modalities for studies, if asked (this is an
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	551 * extension to standard DICOM)
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	552 * http://www.medicalconnections.co.uk/kb/Filtering_on_and_Retrieving_the_Modality_in_a_C_FIND
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	553 **/
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	554
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	555 if (level == ResourceType_Study &&
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	556 input.HasTag(DICOM_TAG_MODALITIES_IN_STUDY))
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	557 {
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	558 std::list<std::string> filtered;
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	559 if (ApplyModalitiesInStudyFilter(filtered, resources, input, context_.GetIndex()))
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	560 {
612 fdd5f7f9c4d7 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 611 diff changeset	561 resources = filtered;
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	562 }
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	563 }
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	564
9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	565
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	566 /**
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	567 * Loop over all the resources for this query level.
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
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	570 for (std::list<std::string>::const_iterator
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 618 diff changeset	571 resource = resources.begin(); resource != resources.end(); ++resource)
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 {
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	573 try
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 {
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	575 std::string instance;
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	576 if (LookupOneInstance(instance, context_.GetIndex(), *resource, level))
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 {
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	578 Json::Value info;
ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	579 context_.ReadJson(info, instance);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	580
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	581 if (Matches(info, query))
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	582 {
615 ec0b7a51d7bd speed up find Sebastien Jodogne <s.jodogne@gmail.com> parents: 612 diff changeset	583 AddAnswer(answers, info, query);
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	584 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 }
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	587 catch (OrthancException&)
0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	588 {
611 9924aec1d694 filtering on modalities Sebastien Jodogne <s.jodogne@gmail.com> parents: 610 diff changeset	589 // This resource has probably been deleted during the find request
608 0bedf8ff9288 basic find scp Sebastien Jodogne <s.jodogne@gmail.com> parents: 565 diff changeset	590 }
565 c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 }
c931ac02db82 refactoring of find class Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 }
682 efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	594
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	595
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	596
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	597 /**
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	598 * TODO : Case-insensitive match for PN value representation (Patient
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	599 * Name). Case-senstive match for all the other value representations.
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	600 *
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	601 * Reference: DICOM PS 3.4
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	602 * - C.2.2.2.1 ("Single Value Matching")
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	603 * - C.2.2.2.4 ("Wild Card Matching")
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	604 * http://medical.nema.org/Dicom/2011/11_04pu.pdf (
efc4928be6fb Recover pixel data for more transfer syntaxes (notably JPEG) Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	605 **/

Mercurial > hg > orthanc

annotate OrthancServer/OrthancFindRequestHandler.cpp @ 846:715ab7674993 jpeg