Mercurial > hg > orthanc
comparison OrthancServer/OrthancRestApi.cpp @ 80:6212bf978584
status of series
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 Sep 2012 15:18:12 +0200 |
parents | b8dfde8d64e8 |
children | ebce15865cce |
comparison
equal
deleted
inserted
replaced
79:297bad4e1019 | 80:6212bf978584 |
---|---|
217 if (!MergeQueryAndTemplate(m, postData)) | 217 if (!MergeQueryAndTemplate(m, postData)) |
218 { | 218 { |
219 return false; | 219 return false; |
220 } | 220 } |
221 | 221 |
222 if (m.GetValue(DicomTag::ACCESSION_NUMBER).AsString().size() <= 2 && | 222 if (m.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 && |
223 m.GetValue(DicomTag::PATIENT_ID).AsString().size() <= 2) | 223 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) |
224 { | 224 { |
225 return false; | 225 return false; |
226 } | 226 } |
227 | 227 |
228 DicomFindAnswers answers; | 228 DicomFindAnswers answers; |
240 if (!MergeQueryAndTemplate(m, postData)) | 240 if (!MergeQueryAndTemplate(m, postData)) |
241 { | 241 { |
242 return false; | 242 return false; |
243 } | 243 } |
244 | 244 |
245 if ((m.GetValue(DicomTag::ACCESSION_NUMBER).AsString().size() <= 2 && | 245 if ((m.GetValue(DICOM_TAG_ACCESSION_NUMBER).AsString().size() <= 2 && |
246 m.GetValue(DicomTag::PATIENT_ID).AsString().size() <= 2) || | 246 m.GetValue(DICOM_TAG_PATIENT_ID).AsString().size() <= 2) || |
247 m.GetValue(DicomTag::STUDY_INSTANCE_UID).AsString().size() <= 2) | 247 m.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).AsString().size() <= 2) |
248 { | 248 { |
249 return false; | 249 return false; |
250 } | 250 } |
251 | 251 |
252 DicomFindAnswers answers; | 252 DicomFindAnswers answers; |
279 DicomMap::SetupFindStudyTemplate(m); | 279 DicomMap::SetupFindStudyTemplate(m); |
280 if (!MergeQueryAndTemplate(m, postData)) | 280 if (!MergeQueryAndTemplate(m, postData)) |
281 { | 281 { |
282 return false; | 282 return false; |
283 } | 283 } |
284 m.CopyTagIfExists(patients.GetAnswer(i), DicomTag::PATIENT_ID); | 284 m.CopyTagIfExists(patients.GetAnswer(i), DICOM_TAG_PATIENT_ID); |
285 | 285 |
286 DicomFindAnswers studies; | 286 DicomFindAnswers studies; |
287 c.FindStudy(studies, m); | 287 c.FindStudy(studies, m); |
288 | 288 |
289 patient["Studies"] = Json::arrayValue; | 289 patient["Studies"] = Json::arrayValue; |
297 DicomMap::SetupFindSeriesTemplate(m); | 297 DicomMap::SetupFindSeriesTemplate(m); |
298 if (!MergeQueryAndTemplate(m, postData)) | 298 if (!MergeQueryAndTemplate(m, postData)) |
299 { | 299 { |
300 return false; | 300 return false; |
301 } | 301 } |
302 m.CopyTagIfExists(studies.GetAnswer(j), DicomTag::PATIENT_ID); | 302 m.CopyTagIfExists(studies.GetAnswer(j), DICOM_TAG_PATIENT_ID); |
303 m.CopyTagIfExists(studies.GetAnswer(j), DicomTag::STUDY_INSTANCE_UID); | 303 m.CopyTagIfExists(studies.GetAnswer(j), DICOM_TAG_STUDY_INSTANCE_UID); |
304 | 304 |
305 DicomFindAnswers series; | 305 DicomFindAnswers series; |
306 c.FindSeries(series, m); | 306 c.FindSeries(series, m); |
307 | 307 |
308 // Loop over the found series | 308 // Loop over the found series |