Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 1737:ec66a16aa398
removal of DicomStringValue and DicomNullValue
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 22 Oct 2015 07:52:24 +0200 |
parents | f967bdf8534e |
children | 1b1d5470233f |
comparison
equal
deleted
inserted
replaced
1736:b953c6eef28d | 1737:ec66a16aa398 |
---|---|
196 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) | 196 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) |
197 { | 197 { |
198 return; | 198 return; |
199 } | 199 } |
200 | 200 |
201 if (fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 && | 201 if (fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 && |
202 fields.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) | 202 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2) |
203 { | 203 { |
204 return; | 204 return; |
205 } | 205 } |
206 | 206 |
207 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); | 207 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); |
226 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) | 226 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) |
227 { | 227 { |
228 return; | 228 return; |
229 } | 229 } |
230 | 230 |
231 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 && | 231 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 && |
232 fields.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) || | 232 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2) || |
233 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2) | 233 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2) |
234 { | 234 { |
235 return; | 235 return; |
236 } | 236 } |
237 | 237 |
238 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); | 238 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); |
257 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) | 257 if (!MergeQueryAndTemplate(fields, call.GetBodyData(), call.GetBodySize())) |
258 { | 258 { |
259 return; | 259 return; |
260 } | 260 } |
261 | 261 |
262 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 && | 262 if ((fields.GetValue(DICOM_TAG_ACCESSION_NUMBER).GetContent().size() <= 2 && |
263 fields.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) || | 263 fields.GetValue(DICOM_TAG_PATIENT_ID).GetContent().size() <= 2) || |
264 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2 || | 264 fields.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent().size() <= 2 || |
265 fields.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).AsString().size() <= 2) | 265 fields.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent().size() <= 2) |
266 { | 266 { |
267 return; | 267 return; |
268 } | 268 } |
269 | 269 |
270 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); | 270 const std::string& localAet = context.GetDefaultLocalApplicationEntityTitle(); |