orthanc: OrthancServer/OrthancRestApi/OrthancRestModalities.cpp comparison

comparison OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 2584:38b5045f2bff jobs

refactoring

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 14 May 2018 21:15:28 +0200
parents	1b6a6d80b6f2
children	4c809711149e

comparison

equal deleted inserted replaced

-:1b6a6d80b6f2
+:38b5045f2bff
 bool ok;
 try
 {
 ok = HandleInstance(GetCurrentInstance());
+if (!ok && !permissive_)
+{
+throw OrthancException(ErrorCode_InternalError);
+}
 }
 catch (OrthancException& e)
-{
-ok = false;
-}
-if (!ok)
 {
 if (permissive_)
 {
-failedInstances_.insert(GetCurrentInstance());
+ok = false;
 }
 else
 {
-return new JobStepResult(JobStepCode_Failure);
+throw;
 }
+}
+if (!ok)
+{
+failedInstances_.insert(GetCurrentInstance());
 }
 Next();
 if (IsDone())
 std::auto_ptr<HttpClient>  client_;
 protected:
 virtual bool HandleInstance(const std::string& instance)
 {
+boost::this_thread::sleep(boost::posix_time::milliseconds(500));
 if (client_.get() == NULL)
 {
 client_.reset(new HttpClient(peer_, "instances"));
 client_->SetMethod(HttpMethod_Post);
 }
 << peer_.GetUrl() << "\"";
 context_.ReadDicom(client_->GetBody(), GetCurrentInstance());
 std::string answer;
-return client_->Apply(answer);
+if (client_->Apply(answer))
+{
+return true;
+}
+else
+{
+throw OrthancException(ErrorCode_NetworkProtocol);
+}
 }
 public:
 OrthancPeerStoreJob(ServerContext& context) :
 context_(context)
 {
+}
+void SetPeer(const WebServiceParameters& peer)
+{
+if (IsStarted())
+{
+throw OrthancException(ErrorCode_BadSequenceOfCalls);
+}
+else
+{
+peer_ = peer;
+}
 }
 const WebServiceParameters& GetPeer() const
 {
 return peer_;
 return true;
 }
+static void SubmitJob(RestApiPostCall& call,
+const Json::Value& request,
+const std::list<std::string>& instances,
+SetOfInstancesJob* jobRaw)
+{
+std::auto_ptr<SetOfInstancesJob> job(jobRaw);
+if (job.get() == NULL)
+{
+throw OrthancException(ErrorCode_NullPointer);
+}
+ServerContext& context = OrthancRestApi::GetContext(call);
+bool permissive = Toolbox::GetJsonBooleanField(request, "Permissive", false);
+bool asynchronous = Toolbox::GetJsonBooleanField(request, "Asynchronous", false);
+int priority = Toolbox::GetJsonIntegerField(request, "Priority", 0);
+job->SetPermissive(permissive);
+job->Reserve(instances.size());
+for (std::list<std::string>::const_iterator
+it = instances.begin(); it != instances.end(); ++it)
+{
+job->AddInstance(*it);
+}
+if (asynchronous)
+{
+// Asynchronous mode: Submit the job, but don't wait for its completion
+std::string id;
+context.GetJobsEngine().GetRegistry().Submit(id, job.release(), priority);
+Json::Value v;
+v["ID"] = id;
+call.GetOutput().AnswerJson(v);
+}
+else if (context.GetJobsEngine().GetRegistry().SubmitAndWait(job.release(), priority))
+{
+// Synchronous mode: We have submitted and waited for completion
+call.GetOutput().AnswerBuffer("{}", "application/json");
+}
+else
+{
+call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
+}
+}
 static void DicomStore(RestApiPostCall& call)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::string remote = call.GetUriComponent("id", "");
 if (!GetInstancesToExport(request, instances, remote, call))
 {
 return;
 }
-std::string localAet = Toolbox::GetJsonStringField(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
+std::string localAet = Toolbox::GetJsonStringField
-bool permissive = Toolbox::GetJsonBooleanField(request, "Permissive", false);
+(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
-bool asynchronous = Toolbox::GetJsonBooleanField(request, "Asynchronous", false);
+std::string moveOriginatorAET = Toolbox::GetJsonStringField
-std::string moveOriginatorAET = Toolbox::GetJsonStringField(request, "MoveOriginatorAet", context.GetDefaultLocalApplicationEntityTitle());
+(request, "MoveOriginatorAet", context.GetDefaultLocalApplicationEntityTitle());
-int moveOriginatorID = Toolbox::GetJsonIntegerField(request, "MoveOriginatorID", 0 /* By default, not a C-MOVE */);
+int moveOriginatorID = Toolbox::GetJsonIntegerField
-int priority = Toolbox::GetJsonIntegerField(request, "Priority", 0);
+(request, "MoveOriginatorID", 0 /* By default, not a C-MOVE */);
 RemoteModalityParameters p = Configuration::GetModalityUsingSymbolicName(remote);
 std::auto_ptr<DicomStoreJob> job(new DicomStoreJob(context));
 job->SetLocalAet(localAet);
 job->SetRemoteModality(p);
-job->SetPermissive(permissive);
 if (moveOriginatorID != 0)
 {
 job->SetMoveOriginator(moveOriginatorAET, moveOriginatorID);
 }
-job->Reserve(instances.size());
+SubmitJob(call, request, instances, job.release());
-for (std::list<std::string>::const_iterator
-it = instances.begin(); it != instances.end(); ++it)
-{
-job->AddInstance(*it);
-}
-if (asynchronous)
-{
-// Asynchronous mode: Submit the job, but don't wait for its completion
-std::string id;
-context.GetJobsEngine().GetRegistry().Submit(id, job.release(), priority);
-Json::Value v;
-v["ID"] = id;
-call.GetOutput().AnswerJson(v);
-}
-else if (context.GetJobsEngine().GetRegistry().SubmitAndWait(job.release(), priority))
-{
-// Synchronous mode: We have submitted and waited for completion
-call.GetOutput().AnswerBuffer("{}", "application/json");
-}
-else
-{
-call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
-}
 }
 /***************************************************************************
 * DICOM C-Move SCU
 throw OrthancException(ErrorCode_BadFileFormat);
 }
 ResourceType level = StringToResourceType(request["Level"].asCString());
-std::string localAet = Toolbox::GetJsonStringField(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
+std::string localAet = Toolbox::GetJsonStringField
-std::string targetAet = Toolbox::GetJsonStringField(request, "TargetAet", context.GetDefaultLocalApplicationEntityTitle());
+(request, "LocalAet", context.GetDefaultLocalApplicationEntityTitle());
+std::string targetAet = Toolbox::GetJsonStringField
+(request, "TargetAet", context.GetDefaultLocalApplicationEntityTitle());
 const RemoteModalityParameters source = Configuration::GetModalityUsingSymbolicName(call.GetUriComponent("id", ""));
 for (Json::Value::ArrayIndex i = 0; i < request[RESOURCES].size(); i++)
 {
 if (!GetInstancesToExport(request, instances, remote, call))
 {
 return;
 }
-bool asynchronous = Toolbox::GetJsonBooleanField(request, "Asynchronous", false);
 WebServiceParameters peer;
 Configuration::GetOrthancPeer(peer, remote);
-ServerJob job;
+std::auto_ptr<OrthancPeerStoreJob> job(new OrthancPeerStoreJob(context));
-for (std::list<std::string>::const_iterator
+job->SetPeer(peer);
-it = instances.begin(); it != instances.end(); ++it)
-{
+SubmitJob(call, request, instances, job.release());
-job.AddCommand(new StorePeerCommand(context, peer, false)).AddInput(*it);
-}
-job.SetDescription("HTTP request: POST to peer \"" + remote + "\"");
-if (asynchronous)
-{
-// Asynchronous mode: Submit the job, but don't wait for its completion
-context.GetScheduler().Submit(job);
-call.GetOutput().AnswerBuffer("{}", "application/json");
-}
-else if (context.GetScheduler().SubmitAndWait(job))
-{
-// Synchronous mode: We have submitted and waited for completion
-call.GetOutput().AnswerBuffer("{}", "application/json");
-}
-else
-{
-call.GetOutput().SignalError(HttpStatus_500_InternalServerError);
-}
 }
 // DICOM bridge -------------------------------------------------------------

Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestModalities.cpp @ 2584:38b5045f2bff jobs