Mercurial > hg > orthanc
annotate Core/RestApi/RestApiPath.cpp @ 3538:23219b9da4d1
fix ordered-slices route to be closer to 1.5.7 behaviour
| author | Alain Mazy <alain@mazy.be> |
|---|---|
| date | Tue, 15 Oct 2019 09:53:33 +0200 |
| parents | 4e43e67f8ecf |
| children | 94f4a18a79cc |
| rev | line source |
|---|---|
| 209 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
975
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
3060
4e43e67f8ecf
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2447
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
| 209 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
824
a811bdf8b8eb
precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
34 #include "../PrecompiledHeaders.h" |
| 209 | 35 #include "RestApiPath.h" |
| 36 | |
|
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
37 #include "../OrthancException.h" |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
38 |
| 209 | 39 #include <cassert> |
| 40 | |
| 41 namespace Orthanc | |
| 42 { | |
| 43 RestApiPath::RestApiPath(const std::string& uri) | |
| 44 { | |
| 45 Toolbox::SplitUriComponents(uri_, uri); | |
| 46 | |
| 47 if (uri_.size() == 0) | |
| 48 { | |
| 218 | 49 hasTrailing_ = false; |
| 209 | 50 return; |
| 51 } | |
| 52 | |
| 53 if (uri_.back() == "*") | |
| 54 { | |
| 55 hasTrailing_ = true; | |
| 56 uri_.pop_back(); | |
| 57 } | |
| 58 else | |
| 59 { | |
| 60 hasTrailing_ = false; | |
| 61 } | |
| 62 | |
| 63 components_.resize(uri_.size()); | |
| 64 for (size_t i = 0; i < uri_.size(); i++) | |
| 65 { | |
| 66 size_t s = uri_[i].size(); | |
| 67 assert(s > 0); | |
| 68 | |
| 69 if (uri_[i][0] == '{' && | |
| 70 uri_[i][s - 1] == '}') | |
| 71 { | |
| 72 components_[i] = uri_[i].substr(1, s - 2); | |
| 73 uri_[i] = ""; | |
| 74 } | |
| 75 else | |
| 76 { | |
| 77 components_[i] = ""; | |
| 78 } | |
| 79 } | |
| 80 } | |
| 81 | |
|
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
82 bool RestApiPath::Match(IHttpHandler::Arguments& components, |
| 209 | 83 UriComponents& trailing, |
| 84 const std::string& uriRaw) const | |
| 85 { | |
| 86 UriComponents uri; | |
| 87 Toolbox::SplitUriComponents(uri, uriRaw); | |
| 88 return Match(components, trailing, uri); | |
| 89 } | |
| 90 | |
|
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
91 bool RestApiPath::Match(IHttpHandler::Arguments& components, |
| 209 | 92 UriComponents& trailing, |
| 93 const UriComponents& uri) const | |
| 94 { | |
|
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
95 assert(uri_.size() == components_.size()); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
96 |
| 209 | 97 if (uri.size() < uri_.size()) |
| 98 { | |
| 99 return false; | |
| 100 } | |
| 101 | |
| 102 if (!hasTrailing_ && uri.size() > uri_.size()) | |
| 103 { | |
| 104 return false; | |
| 105 } | |
| 106 | |
| 107 components.clear(); | |
| 108 trailing.clear(); | |
| 109 | |
| 110 assert(uri_.size() <= uri.size()); | |
| 111 for (size_t i = 0; i < uri_.size(); i++) | |
| 112 { | |
| 113 if (components_[i].size() == 0) | |
| 114 { | |
| 115 // This URI component is not a free parameter | |
| 116 if (uri_[i] != uri[i]) | |
| 117 { | |
| 118 return false; | |
| 119 } | |
| 120 } | |
| 121 else | |
| 122 { | |
| 123 // This URI component is a free parameter | |
| 124 components[components_[i]] = uri[i]; | |
| 125 } | |
| 126 } | |
| 127 | |
| 128 if (hasTrailing_) | |
| 129 { | |
| 130 trailing.assign(uri.begin() + uri_.size(), uri.end()); | |
| 131 } | |
| 132 | |
| 133 return true; | |
| 134 } | |
| 135 | |
| 136 | |
| 137 bool RestApiPath::Match(const UriComponents& uri) const | |
| 138 { | |
|
1441
f3672356c121
refactoring: IHttpHandler and HttpToolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
139 IHttpHandler::Arguments components; |
| 209 | 140 UriComponents trailing; |
| 141 return Match(components, trailing, uri); | |
| 142 } | |
|
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
143 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
144 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
145 bool RestApiPath::IsWildcardLevel(size_t level) const |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
146 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
147 assert(uri_.size() == components_.size()); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
148 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
149 if (level >= uri_.size()) |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
150 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
151 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
152 } |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
153 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
154 return uri_[level].length() == 0; |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
155 } |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
156 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
157 const std::string& RestApiPath::GetWildcardName(size_t level) const |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
158 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
159 assert(uri_.size() == components_.size()); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
160 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
161 if (!IsWildcardLevel(level)) |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
162 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
163 throw OrthancException(ErrorCode_BadParameterType); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
164 } |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
165 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
166 return components_[level]; |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
167 } |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
168 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
169 const std::string& RestApiPath::GetLevelName(size_t level) const |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
170 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
171 assert(uri_.size() == components_.size()); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
172 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
173 if (IsWildcardLevel(level)) |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
174 { |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
175 throw OrthancException(ErrorCode_BadParameterType); |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
176 } |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
177 |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
178 return uri_[level]; |
|
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
179 } |
| 209 | 180 } |
|
966
886652370ff2
accelerating REST API matching
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
181 |