orthanc: Core/DicomParsing/FromDcmtkBridge.cpp comparison

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 2954:d924f9bb61cc

taking advantage of details in OrthancException

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 03 Dec 2018 14:35:34 +0100
parents	ae20fccdd867
children	4e43e67f8ecf

comparison

equal deleted inserted replaced

-:210d5afd8f2b
+:d924f9bb61cc
 TemporaryFile tmp;
 tmp.Write(content);
 if (!dictionary.loadDictionary(tmp.GetPath().c_str()))
 {
-LOG(ERROR) << "Cannot read embedded dictionary. Under Windows, make sure that "
+throw OrthancException(ErrorCode_InternalError,
-<< "your TEMP directory does not contain special characters.";
+"Cannot read embedded dictionary. Under Windows, make sure that "
-throw OrthancException(ErrorCode_InternalError);
+"your TEMP directory does not contain special characters.");
 }
 #else
 if (!dictionary.loadFromMemory(content))
 {
-LOG(ERROR) << "Cannot read embedded dictionary. Under Windows, make sure that "
+throw OrthancException(ErrorCode_InternalError,
-<< "your TEMP directory does not contain special characters.";
+"Cannot read embedded dictionary. Under Windows, make sure that "
-throw OrthancException(ErrorCode_InternalError);
+"your TEMP directory does not contain special characters.");
 }
 #endif
 }
 #else
 }
 /* make sure data dictionary is loaded */
 if (!dcmDataDict.isDictionaryLoaded())
 {
-LOG(ERROR) << "No DICOM dictionary loaded, check environment variable: " << DCM_DICT_ENVIRONMENT_VARIABLE;
+throw OrthancException(ErrorCode_InternalError,
-throw OrthancException(ErrorCode_InternalError);
+"No DICOM dictionary loaded, check environment variable: " +
+std::string(DCM_DICT_ENVIRONMENT_VARIABLE));
 }
 {
 // Test the dictionary with a simple DICOM tag
 DcmTag key(0x0010, 0x1030); // This is PatientWeight
 if (key.getEVR() != EVR_DS)
 {
-LOG(ERROR) << "The DICOM dictionary has not been correctly read";
+throw OrthancException(ErrorCode_InternalError,
-throw OrthancException(ErrorCode_InternalError);
+"The DICOM dictionary has not been correctly read");
 }
 }
 }
 tag.GetGroup() == 0xffff)
 {
 char buf[128];
 sprintf(buf, "Trying to register private tag (%04x,%04x), but it must have an odd group >= 0x0009",
 tag.GetGroup(), tag.GetElement());
-LOG(ERROR) << buf;
+throw OrthancException(ErrorCode_ParameterOutOfRange, std::string(buf));
-throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 entry.reset(new DcmDictEntry(tag.GetGroup(),
 tag.GetElement(),
 evr, name.c_str(),
 {
 DictionaryLocker locker;
 if (locker->findEntry(name.c_str()))
 {
-LOG(ERROR) << "Cannot register two tags with the same symbolic name \"" << name << "\"";
+throw OrthancException(ErrorCode_AlreadyExistingTag,
-throw OrthancException(ErrorCode_AlreadyExistingTag);
+"Cannot register two tags with the same symbolic name \"" + name + "\"");
 }
 locker->addEntry(entry.release());
 }
 }
 ok = false;
 }
 if (!ok)
 {
-LOG(ERROR) << "While creating a DICOM instance, tag (" << tag.Format()
+throw OrthancException(ErrorCode_BadFileFormat,
-<< ") has out-of-range value: \"" << *decoded << "\"";
+"While creating a DICOM instance, tag (" + tag.Format() +
-throw OrthancException(ErrorCode_BadFileFormat);
+") has out-of-range value: \"" + (*decoded) + "\"");
 }
 }
 DcmElement* FromDcmtkBridge::FromJson(const DicomTag& tag,
 const Json::Value& value = json[tags[i]];
 if (value.type() != Json::stringValue ||
 (value.asString().length() != 0 &&
 !GetDicomEncoding(encoding, value.asCString())))
 {
-LOG(ERROR) << "Unknown encoding while creating DICOM from JSON: " << value;
+throw OrthancException(ErrorCode_BadRequest,
-throw OrthancException(ErrorCode_BadRequest);
+"Unknown encoding while creating DICOM from JSON: " +
+value.toStyledString());
 }
 if (value.asString().length() == 0)
 {
 return defaultEncoding;
 std::auto_ptr<DcmFileFormat> result(new DcmFileFormat);
 result->transferInit();
 if (!result->read(is).good())
 {
-LOG(ERROR) << "Cannot parse an invalid DICOM file (size: " << size << " bytes)";
+throw OrthancException(ErrorCode_BadFileFormat,
-throw OrthancException(ErrorCode_BadFileFormat);
+"Cannot parse an invalid DICOM file (size: " +
+boost::lexical_cast<std::string>(size) + " bytes)");
 }
 result->loadAllDataIntoMemory();
 result->transferEnd();
 return;
 }
 if (output.type() != Json::objectValue)
 {
-LOG(ERROR) << "Lua: IncomingFindRequestFilter must return a table";
+throw OrthancException(ErrorCode_LuaBadOutput,
-throw OrthancException(ErrorCode_LuaBadOutput);
+"Lua: IncomingFindRequestFilter must return a table");
 }
 Json::Value::Members members = output.getMemberNames();
 for (size_t i = 0; i < members.size(); i++)
 {
 if (output[members[i]].type() != Json::stringValue)
 {
-LOG(ERROR) << "Lua: IncomingFindRequestFilter must return a table mapping names of DICOM tags to strings";
+throw OrthancException(ErrorCode_LuaBadOutput,
-throw OrthancException(ErrorCode_LuaBadOutput);
+"Lua: IncomingFindRequestFilter must return a table "
+"mapping names of DICOM tags to strings");
 }
 DicomTag tag(ParseTag(members[i]));
 target.SetValue(tag, output[members[i]].asString(), false);
 }
 case ITagVisitor::Action_Replace:
 {
 std::string s = Toolbox::ConvertFromUtf8(newValue, encoding);
 if (element.putString(s.c_str()) != EC_Normal)
 {
-LOG(ERROR) << "Cannot replace value of tag: " << tag.Format();
+throw OrthancException(ErrorCode_InternalError,
-throw OrthancException(ErrorCode_InternalError);
+"Cannot replace value of tag: " + tag.Format());
 }
 break;
 }

Mercurial > hg > orthanc

comparison Core/DicomParsing/FromDcmtkBridge.cpp @ 2954:d924f9bb61cc