orthanc: OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp comparison

fixed /move documentation + improved error reporting

comparison

equal deleted inserted replaced

-:88d838c6b4c7
+:c014ab79fca5
 return result.release();
 }
 void FromDcmtkBridge::FromJson(DicomMap& target,
-const Json::Value& source)
+const Json::Value& source,
+const char* fieldName)
 {
 if (source.type() != Json::objectValue)
 {
-throw OrthancException(ErrorCode_BadFileFormat);
+if (fieldName != NULL)
+{
+throw OrthancException(ErrorCode_BadFileFormat, std::string("Expecting an object in field '") + std::string(fieldName) + std::string("'"));
+}
+else
+{
+throw OrthancException(ErrorCode_BadFileFormat, "Expecting an object");
+}
 }
 target.Clear();
 Json::Value::Members members = source.getMemberNames();
 {
 const Json::Value& value = source[members[i]];
 if (value.type() != Json::stringValue)
 {
-throw OrthancException(ErrorCode_BadFileFormat);
+throw OrthancException(ErrorCode_BadFileFormat, std::string("Expecting a string in field '") + members[i] + std::string("'"));
 }
 target.SetValue(ParseTag(members[i]), value.asString(), false);
 }
 }
 void FromDcmtkBridge::ChangeStringEncoding(DcmItem& dataset,
 Encoding source,
 bool hasSourceCodeExtensions,

Mercurial > hg > orthanc