Mercurial > hg > orthanc-stone
changeset 2248:7e8623928cbf
fix interpretation of DS and IS value representations in dicomweb
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 26 Nov 2025 13:14:41 +0100 |
| parents | 098fbdff9945 |
| children | f1db8845b45c |
| files | OrthancStone/Sources/Toolbox/OrthancDatasets/DicomWebDataset.cpp |
| diffstat | 1 files changed, 35 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/OrthancDatasets/DicomWebDataset.cpp Wed Nov 26 12:39:22 2025 +0100 +++ b/OrthancStone/Sources/Toolbox/OrthancDatasets/DicomWebDataset.cpp Wed Nov 26 13:14:41 2025 +0100 @@ -24,6 +24,7 @@ #include "DicomWebDataset.h" #include <OrthancException.h> +#include <SerializationToolbox.h> #include <boost/lexical_cast.hpp> @@ -169,8 +170,7 @@ result = (*value) [0][ALPHABETIC].asString(); return true; } - else if ((vr == "DS" || - vr == "FD" || + else if ((vr == "FD" || vr == "FL") && (*value) [0].isDouble()) { @@ -185,8 +185,7 @@ result = boost::lexical_cast<std::string>((*value) [0].asUInt64()); return true; } - else if ((vr == "IS" || - vr == "SL" || + else if ((vr == "SL" || vr == "SS" || vr == "SV") && (*value) [0].isInt64()) @@ -194,10 +193,40 @@ result = boost::lexical_cast<std::string>((*value) [0].asInt64()); return true; } - else + else if (vr == "DS") { - throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Unsupported value representation: " + vr); + const Json::Value& a = (*value) [0]; + double b; + if (a.isString() && + Orthanc::SerializationToolbox::ParseDouble(b, a.asString())) + { + result = boost::lexical_cast<std::string>(b); + return true; + } + else if (a.isDouble()) + { + result = boost::lexical_cast<std::string>(a.asDouble()); + return true; + } } + else if (vr == "IS") + { + const Json::Value& a = (*value) [0]; + int64_t b; + if (a.isString() && + Orthanc::SerializationToolbox::ParseInteger64(b, a.asString())) + { + result = boost::lexical_cast<std::string>(b); + return true; + } + else if (a.isInt64()) + { + result = boost::lexical_cast<std::string>(a.asInt64()); + return true; + } + } + + throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented, "Unsupported value representation: " + vr); } else if (value->type() == Json::arrayValue && vr == "SQ")