Mercurial > hg > orthanc
changeset 722:3596177682a9
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 14 Feb 2014 16:12:44 +0100 |
parents | 9b15028ddc1b |
children | 0da078f3affc |
files | OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/OrthancFindRequestHandler.cpp OrthancServer/OrthancMoveRequestHandler.cpp |
diffstat | 4 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancServer/Internals/FindScp.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/Internals/FindScp.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -95,7 +95,7 @@ *responseIdentifiers = NULL; return; } - + if (responseCount <= static_cast<int>(data.answers_.GetSize())) { response->DimseStatus = STATUS_Pending;
--- a/OrthancServer/Internals/MoveScp.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/Internals/MoveScp.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -82,6 +82,7 @@ try { data.iterator_.reset(data.handler_->Handle(data.target_, data.input_)); + if (data.iterator_.get() == NULL) { // Internal error!
--- a/OrthancServer/OrthancFindRequestHandler.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/OrthancFindRequestHandler.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -210,6 +210,10 @@ value = resource.get(tag, Json::arrayValue).get("Value", "").asString(); result.SetValue(query.GetElement(i).GetTag(), value); } + else + { + result.SetValue(query.GetElement(i).GetTag(), ""); + } } }
--- a/OrthancServer/OrthancMoveRequestHandler.cpp Fri Feb 14 12:45:51 2014 +0100 +++ b/OrthancServer/OrthancMoveRequestHandler.cpp Fri Feb 14 16:12:44 2014 +0100 @@ -139,7 +139,6 @@ ResourceType level = StringToResourceType(levelTmp->AsString().c_str()); - /** * Lookup for the resource to be sent. **/