Mercurial > hg > orthanc
diff OrthancServer/OrthancRestApi/OrthancRestChanges.cpp @ 1247:32fcc5dc7562
abstraction
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 08 Dec 2014 13:54:27 +0100 |
parents | 83622b0f544c |
children | 6e7e5ed91c2d |
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestChanges.cpp Mon Dec 08 12:56:30 2014 +0100 +++ b/OrthancServer/OrthancRestApi/OrthancRestChanges.cpp Mon Dec 08 13:54:27 2014 +0100 @@ -81,11 +81,16 @@ GetSinceAndLimit(since, limit, last, call); Json::Value result; - if ((!last && context.GetIndex().GetChanges(result, since, limit)) || - ( last && context.GetIndex().GetLastChange(result))) + if (last) { - call.GetOutput().AnswerJson(result); + context.GetIndex().GetLastChange(result); } + else + { + context.GetIndex().GetChanges(result, since, limit); + } + + call.GetOutput().AnswerJson(result); } @@ -108,11 +113,16 @@ GetSinceAndLimit(since, limit, last, call); Json::Value result; - if ((!last && context.GetIndex().GetExportedResources(result, since, limit)) || - ( last && context.GetIndex().GetLastExportedResource(result))) + if (last) { - call.GetOutput().AnswerJson(result); + context.GetIndex().GetLastExportedResource(result); } + else + { + context.GetIndex().GetExportedResources(result, since, limit); + } + + call.GetOutput().AnswerJson(result); }