orthanc: OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp comparison

comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1569:27774f6f84e4

improved error handling in http answers

author	jodogne
date	Sun, 23 Aug 2015 11:01:15 +0200
parents	3be6eb3757c8
children	2bd2c280f9b5

comparison

equal deleted inserted replaced

-:818ae9bc493a
+:27774f6f84e4
 **/
 std::string modifiedInstance;
 if (context.Store(modifiedInstance, toStore) != StoreStatus_Success)
 {
-LOG(ERROR) << "Error while storing a modified instance " << *it;
+throw OrthancException("Error while storing a modified instance " + *it);
-return;
 }
 // Sanity checks in debug mode
 assert(modifiedInstance == modifiedHasher.HashInstance());
 changeType, resourceType, call);
 }
 }
-static bool StoreCreatedInstance(std::string& id /* out */,
+static void StoreCreatedInstance(std::string& id /* out */,
 ServerContext& context,
 ParsedDicomFile& dicom)
 {
 DicomInstanceToStore toStore;
 toStore.SetParsedDicomFile(dicom);
 StoreStatus status = context.Store(id, toStore);
 if (status == StoreStatus_Failure)
 {
-LOG(ERROR) << "Error while storing a manually-created instance";
+throw OrthancException("Error while storing a manually-created instance");
-return false;
+}
 }
-else
-{
-return true;
+static void CreateDicomV1(ParsedDicomFile& dicom,
-}
-}
-static bool CreateDicomV1(ParsedDicomFile& dicom,
 const Json::Value& request)
 {
 // curl http://localhost:8042/tools/create-dicom -X POST -d '{"PatientName":"Hello^World"}'
 // curl http://localhost:8042/tools/create-dicom -X POST -d '{"PatientName":"Hello^World","PixelData":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gUGDDcB53FulQAAAElJREFUGNNtj0sSAEEEQ1+U+185s1CtmRkblQ9CZldsKHJDk6DLGLJa6chjh0ooQmpjXMM86zPwydGEj6Ed/UGykkEM8X+p3u8/8LcOJIWLGeMAAAAASUVORK5CYII="}'
 for (size_t i = 0; i < members.size(); i++)
 {
 const std::string& name = members[i];
 if (request[name].type() != Json::stringValue)
 {
-LOG(ERROR) << "Only string values are supported when creating DICOM instances";
+throw OrthancException("Only string values are supported when creating DICOM instances");
-return false;
 }
 std::string value = request[name].asString();
 DicomTag tag = FromDcmtkBridge::ParseTag(name);
 else
 {
 dicom.Replace(tag, value);
 }
 }
+}
-return true;
-}
+static void InjectTags(ParsedDicomFile& dicom,
-static bool InjectTags(ParsedDicomFile& dicom,
 const Json::Value& tags)
 {
 if (tags.type() != Json::objectValue)
 {
-LOG(ERROR) << "Bad syntax to specify the tags";
+throw OrthancException("Bad syntax to specify the tags");
-return false;
 }
 // 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)
 {
-LOG(ERROR) << "Only string values are supported when creating DICOM instances";
+throw OrthancException("Only string values are supported when creating DICOM instances");
-return false;
 }
 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))
 {
-LOG(ERROR) << "Trying to override a value inherited from a parent module";
+throw OrthancException("Trying to override a value inherited from a parent module");
-return false;
 }
 if (tag == DICOM_TAG_PIXEL_DATA)
 {
-LOG(ERROR) << "Use \"Content\" to inject an image into a new DICOM instance";
+throw OrthancException("Use \"Content\" to inject an image into a new DICOM instance");
-return false;
 }
 else
 {
 dicom.Replace(tag, Toolbox::ConvertFromUtf8(value, dicom.GetEncoding()));
 }
 }
 }
-return true;
 }
 static void CreateSeries(RestApiPostCall& call,
 ParsedDicomFile& base /* in */,
 base.Replace(DICOM_TAG_IMAGES_IN_ACQUISITION, boost::lexical_cast<std::string>(content.size()));
 base.Replace(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS, "1");
 std::string someInstance;
-bool ok = true;
 try
 {
-for (Json::ArrayIndex i = 0; ok && i < content.size(); i++)
+for (Json::ArrayIndex i = 0; i < content.size(); i++)
 {
 std::auto_ptr<ParsedDicomFile> dicom(base.Clone());
 const Json::Value* payload = NULL;
 if (content[i].type() == Json::stringValue)
 }
 else if (content[i].type() == Json::objectValue)
 {
 if (!content[i].isMember("Content"))
 {
-LOG(ERROR) << "No payload is present for one instance in the series";
+throw OrthancException("No payload is present for one instance in the series");
-ok = false;
-break;
 }
 payload = &content[i]["Content"];
-if (content[i].isMember("Tags") &&
+if (content[i].isMember("Tags"))
-!InjectTags(*dicom, content[i]["Tags"]))
+	    {
-{
+InjectTags(*dicom, content[i]["Tags"]);
-ok = false;
+	    }
-break;
-}
 }
 if (payload == NULL ||
 payload->type() != Json::stringValue)
 {
-LOG(ERROR) << "The payload of the DICOM instance must be specified according to Data URI scheme";
+throw OrthancException("The payload of the DICOM instance must be specified according to Data URI scheme");
-ok = false;
-break;
 }
 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 (!StoreCreatedInstance(someInstance, context, *dicom))
+StoreCreatedInstance(someInstance, context, *dicom);
-{
+}
-LOG(ERROR) << "Error while creating the series";
+}
-ok = false;
+catch (OrthancException& e)
-break;
+{
-}
+// Error: Remove the newly-created series
-}
-}
+std::string series;
-catch (OrthancException&)
+if (context.GetIndex().LookupParent(series, someInstance))
-{
+	{
-ok = false;
+Json::Value dummy;
+context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
+	}
+throw e;
 }
 std::string series;
 if (context.GetIndex().LookupParent(series, someInstance))
 {
-if (ok)
+OrthancRestApi::GetApi(call).AnswerStoredResource(call, series, ResourceType_Series, StoreStatus_Success);
-{
-OrthancRestApi::GetApi(call).AnswerStoredResource(call, series, ResourceType_Series, StoreStatus_Success);
-}
-else
-{
-// Error: Remove the newly-created series
-Json::Value dummy;
-context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
-}
 }
 }
 static void CreateDicomV2(RestApiPostCall& call,
 ServerContext& context = OrthancRestApi::GetContext(call);
 if (!request.isMember("Tags") ||
 request["Tags"].type() != Json::objectValue)
 {
-return;
+throw OrthancException(ErrorCode_BadRequest);
 }
 ParsedDicomFile dicom;
 {
 if (request["Tags"].isMember("SpecificCharacterSet"))
 {
 const char* tmp = request["Tags"]["SpecificCharacterSet"].asCString();
 if (!GetDicomEncoding(encoding, tmp))
 {
-LOG(ERROR) << "Unknown specific character set: " << tmp;
+throw OrthancException("Unknown specific character set: " + std::string(tmp));
-return;
 }
 }
 else
 {
 std::string tmp = Configuration::GetGlobalStringParameter("DefaultEncoding", "Latin1");
 {
 // Locate the parent tags
 std::string parent = request["Parent"].asString();
 if (!context.GetIndex().LookupResourceType(parentType, parent))
 {
-LOG(ERROR) << "Trying to attach a new DICOM instance to an inexistent resource: " << parent;
+throw OrthancException("Trying to attach a new DICOM instance to an inexistent resource: " + parent);
-return;
 }
 if (parentType == ResourceType_Instance)
 {
-LOG(ERROR) << "Trying to attach a new DICOM instance to an instance (must be a series, study or patient): " << parent;
+throw OrthancException("Trying to attach a new DICOM instance to an instance (must be a series, study or patient): " + parent);
-return;
 }
 // Select one existing child instance of the parent resource, to
 // retrieve all its tags
 Json::Value siblingTags;
 // Retrieve all the instances of the parent resource
 std::list<std::string>  siblingInstances;
 context.GetIndex().GetChildInstances(siblingInstances, parent);
 if (siblingInstances.empty())
-{
+	{
-return;   // Error: No instance (should never happen)
+	  // Error: No instance (should never happen)
+throw OrthancException(ErrorCode_InternalError);
 }
 context.ReadJson(siblingTags, siblingInstances.front());
 }
 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()))
 {
-LOG(ERROR) << "Unable to get the encoding of the parent resource";
+throw OrthancException("Unable to get the encoding of the parent resource");
-return;
 }
 dicom.SetEncoding(encoding);
 }
 }
 // Go up
 std::string tmp;
 if (!context.GetIndex().LookupParent(tmp, parent))
 {
-return;
+throw OrthancException(ErrorCode_InternalError);
 }
 parent = tmp;
 type = GetParentResourceType(type);
 }
 dicom.Replace(DICOM_TAG_STUDY_DATE, date);
 dicom.Replace(DICOM_TAG_STUDY_TIME, time);
 }
-if (!InjectTags(dicom, request["Tags"]))
+InjectTags(dicom, request["Tags"]);
-{
-return;  // Error
-}
 // Inject the content (either an image, or a PDF file)
 if (request.isMember("Content"))
 {
 return;
 }
 }
 else
 {
-LOG(ERROR) << "The payload of the DICOM instance must be specified according to Data URI scheme";
+throw OrthancException("The payload of the DICOM instance must be specified according to Data URI scheme");
 return;
 }
 }
 std::string id;
-if (StoreCreatedInstance(id, context, dicom))
+StoreCreatedInstance(id, context, dicom);
-{
+OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
-OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
-}
 return;
 }
 static void CreateDicom(RestApiPostCall& call)
 {
 Json::Value request;
-if (call.ParseJsonRequest(request) &&
+if (!call.ParseJsonRequest(request) ||
-request.isObject())
+!request.isObject())
 {
-if (request.isMember("Tags"))
+	throw OrthancException(ErrorCode_BadRequest);
-{
+}
-CreateDicomV2(call, request);
-}
+if (request.isMember("Tags"))
-else
+{
-{
+	CreateDicomV2(call, request);
-// Compatibility with Orthanc <= 0.9.3
+}
-ServerContext& context = OrthancRestApi::GetContext(call);
+else
-ParsedDicomFile dicom;
+{
-if (CreateDicomV1(dicom, request))
+	// Compatibility with Orthanc <= 0.9.3
-{
+	ServerContext& context = OrthancRestApi::GetContext(call);
-std::string id;
+	ParsedDicomFile dicom;
-if (StoreCreatedInstance(id, context, dicom))
+	CreateDicomV1(dicom, request);
-{
-OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
+	std::string id;
-}
+	StoreCreatedInstance(id, context, dicom);
-}
+	OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
 }
-}
 }
 void OrthancRestApi::RegisterAnonymizeModify()
 {

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1569:27774f6f84e4