Mercurial > hg > orthanc
comparison OrthancServer/OrthancFindRequestHandler.cpp @ 2124:2b1520efa282
cleaning up
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 12:11:34 +0100 |
parents | 4b02ec79728a |
children | 90ea60bee5ff |
comparison
equal
deleted
inserted
replaced
2123:1cf093cbdad8 | 2124:2b1520efa282 |
---|---|
119 | 119 |
120 for (std::list<std::string>::const_iterator | 120 for (std::list<std::string>::const_iterator |
121 it = instances.begin(); it != instances.end(); ++it) | 121 it = instances.begin(); it != instances.end(); ++it) |
122 { | 122 { |
123 Json::Value dicom; | 123 Json::Value dicom; |
124 context.ReadJson(dicom, *it); | 124 context.ReadDicomAsJson(dicom, *it); |
125 | 125 |
126 if (dicom.isMember(formatted)) | 126 if (dicom.isMember(formatted)) |
127 { | 127 { |
128 const Json::Value& source = dicom[formatted]; | 128 const Json::Value& source = dicom[formatted]; |
129 | 129 |
658 bool complete = true; | 658 bool complete = true; |
659 | 659 |
660 for (size_t i = 0; i < instances.size(); i++) | 660 for (size_t i = 0; i < instances.size(); i++) |
661 { | 661 { |
662 Json::Value dicom; | 662 Json::Value dicom; |
663 context_.ReadJson(dicom, instances[i]); | 663 context_.ReadDicomAsJson(dicom, instances[i]); |
664 | 664 |
665 if (finder.IsMatch(dicom)) | 665 if (finder.IsMatch(dicom)) |
666 { | 666 { |
667 if (maxResults != 0 && | 667 if (maxResults != 0 && |
668 answers.GetSize() >= maxResults) | 668 answers.GetSize() >= maxResults) |