orthanc: OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp comparison

comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1582:bd1889029cbb

encoding of exceptions

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 25 Aug 2015 17:39:38 +0200
parents	904096e7367e
children	644c32c07306

comparison

equal deleted inserted replaced

-:357c4bb15701
+:bd1889029cbb
 **/
 std::string modifiedInstance;
 if (context.Store(modifiedInstance, toStore) != StoreStatus_Success)
 {
-throw OrthancException("Error while storing a modified instance " + *it);
+LOG(ERROR) << "Error while storing a modified instance " << *it;
+throw OrthancException(ErrorCode_CannotStoreInstance);
 }
 // Sanity checks in debug mode
 assert(modifiedInstance == modifiedHasher.HashInstance());
 ServerContext& context = OrthancRestApi::GetContext(call);
 StoreStatus status = context.Store(id, toStore);
 if (status == StoreStatus_Failure)
 {
-throw OrthancException("Error while storing a manually-created instance");
+throw OrthancException(ErrorCode_CannotStoreInstance);
 }
 }
 static void CreateDicomV1(ParsedDicomFile& dicom,
 for (size_t i = 0; i < members.size(); i++)
 {
 const std::string& name = members[i];
 if (request[name].type() != Json::stringValue)
 {
-throw OrthancException("Only string values are supported when creating DICOM instances");
+throw OrthancException(ErrorCode_CreateDicomNotString);
 }
 std::string value = request[name].asString();
 DicomTag tag = FromDcmtkBridge::ParseTag(name);
 static void InjectTags(ParsedDicomFile& dicom,
 const Json::Value& tags)
 {
 if (tags.type() != Json::objectValue)
 {
-throw OrthancException("Bad syntax to specify the tags");
+throw OrthancException(ErrorCode_BadRequest);
 }
 // Inject the user-specified tags
 Json::Value::Members members = tags.getMemberNames();
 for (size_t i = 0; i < members.size(); i++)
 {
 const std::string& name = members[i];
 if (tags[name].type() != Json::stringValue)
 {
-throw OrthancException("Only string values are supported when creating DICOM instances");
+throw OrthancException(ErrorCode_CreateDicomNotString);
 }
 std::string value = tags[name].asString();
 DicomTag tag = FromDcmtkBridge::ParseTag(name);
 if (tag != DICOM_TAG_SPECIFIC_CHARACTER_SET)
 {
 if (tag != DICOM_TAG_PATIENT_ID &&
 dicom.HasTag(tag))
 {
-throw OrthancException("Trying to override a value inherited from a parent module");
+throw OrthancException(ErrorCode_CreateDicomOverrideTag);
 }
 if (tag == DICOM_TAG_PIXEL_DATA)
 {
-throw OrthancException("Use \"Content\" to inject an image into a new DICOM instance");
+throw OrthancException(ErrorCode_CreateDicomUseContent);
 }
 else
 {
 dicom.Replace(tag, Toolbox::ConvertFromUtf8(value, dicom.GetEncoding()));
 }
 }
 else if (content[i].type() == Json::objectValue)
 {
 if (!content[i].isMember("Content"))
 {
-throw OrthancException("No payload is present for one instance in the series");
+throw OrthancException(ErrorCode_CreateDicomNoPayload);
 }
 payload = &content[i]["Content"];
 if (content[i].isMember("Tags"))
 }
 if (payload == NULL ||
 payload->type() != Json::stringValue)
 {
-throw OrthancException("The payload of the DICOM instance must be specified according to Data URI scheme");
+throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
 }
 dicom->EmbedContent(payload->asString());
 dicom->Replace(DICOM_TAG_INSTANCE_NUMBER, boost::lexical_cast<std::string>(i + 1));
 dicom->Replace(DICOM_TAG_IMAGE_INDEX, boost::lexical_cast<std::string>(i + 1));
 if (request["Tags"].isMember("SpecificCharacterSet"))
 {
 const char* tmp = request["Tags"]["SpecificCharacterSet"].asCString();
 if (!GetDicomEncoding(encoding, tmp))
 {
-throw OrthancException("Unknown specific character set: " + std::string(tmp));
+LOG(ERROR) << "Unknown specific character set: " << std::string(tmp);
+throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 }
 else
 {
 std::string tmp = Configuration::GetGlobalStringParameter("DefaultEncoding", "Latin1");
 {
 // Locate the parent tags
 std::string parent = request["Parent"].asString();
 if (!context.GetIndex().LookupResourceType(parentType, parent))
 {
-throw OrthancException("Trying to attach a new DICOM instance to an inexistent resource: " + parent);
+throw OrthancException(ErrorCode_CreateDicomBadParent);
 }
 if (parentType == ResourceType_Instance)
 {
-throw OrthancException("Trying to attach a new DICOM instance to an instance (must be a series, study or patient): " + parent);
+throw OrthancException(ErrorCode_CreateDicomParentIsInstance);
 }
 // Select one existing child instance of the parent resource, to
 // retrieve all its tags
 Json::Value siblingTags;
 Encoding encoding;
 if (!siblingTags[SPECIFIC_CHARACTER_SET].isMember("Value") ||
 siblingTags[SPECIFIC_CHARACTER_SET]["Value"].type() != Json::stringValue ||
 !GetDicomEncoding(encoding, siblingTags[SPECIFIC_CHARACTER_SET]["Value"].asCString()))
 {
-throw OrthancException("Unable to get the encoding of the parent resource");
+throw OrthancException(ErrorCode_CreateDicomParentEncoding);
 }
 dicom.SetEncoding(encoding);
 }
 }
 return;
 }
 }
 else
 {
-throw OrthancException("The payload of the DICOM instance must be specified according to Data URI scheme");
+throw OrthancException(ErrorCode_CreateDicomUseDataUriScheme);
 return;
 }
 }
 std::string id;

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1582:bd1889029cbb