Mercurial > hg > orthanc
changeset 3391:df0f1821b3de
better fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 06 Jun 2019 10:19:28 +0200 |
| parents | d1445f2df123 |
| children | ad434967a68c |
| files | Core/DicomParsing/DicomWebJsonVisitor.cpp |
| diffstat | 1 files changed, 21 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/DicomParsing/DicomWebJsonVisitor.cpp Thu Jun 06 09:52:19 2019 +0200 +++ b/Core/DicomParsing/DicomWebJsonVisitor.cpp Thu Jun 06 10:19:28 2019 +0200 @@ -551,15 +551,6 @@ node[KEY_VALUE] = Json::arrayValue; for (size_t i = 0; i < tokens.size(); i++) { - /** - * The following call to "StripSpaces()" fixes the issue - * reported by Rana Asim Wajid on 2019-06-05 ("Error - * Exception while invoking plugin service 32: Bad file - * format"): - * https://groups.google.com/d/msg/orthanc-users/T32FovWPcCE/-hKFbfRJBgAJ - **/ - tokens[i] = Orthanc::Toolbox::StripSpaces(tokens[i]); - try { switch (vr) @@ -593,30 +584,45 @@ } case ValueRepresentation_IntegerString: - if (tokens[i].empty()) + { + /** + * The calls to "StripSpaces()" below fix the + * issue reported by Rana Asim Wajid on 2019-06-05 + * ("Error Exception while invoking plugin service + * 32: Bad file format"): + * https://groups.google.com/d/msg/orthanc-users/T32FovWPcCE/-hKFbfRJBgAJ + **/ + + std::string t = Orthanc::Toolbox::StripSpaces(tokens[i]); + if (t.empty()) { node[KEY_VALUE].append(Json::nullValue); } else { - int64_t value = boost::lexical_cast<int64_t>(tokens[i]); + int64_t value = boost::lexical_cast<int64_t>(t); node[KEY_VALUE].append(FormatInteger(value)); } - + break; + } case ValueRepresentation_DecimalString: - if (tokens[i].empty()) + { + std::string t = Orthanc::Toolbox::StripSpaces(tokens[i]); + if (t.empty()) { node[KEY_VALUE].append(Json::nullValue); } else { - double value = boost::lexical_cast<double>(tokens[i]); + double value = boost::lexical_cast<double>(t); node[KEY_VALUE].append(FormatDouble(value)); } + break; - + } + default: if (tokens[i].empty()) {