Explorar o código

Merge pull request #10843 from wangkx/h18943

HPCC-18943 Deprecate LastNDays filter from WUQuery

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=7) %!d(string=hai) anos
pai
achega
d6bba374a7

+ 2 - 2
esp/scm/ws_workunits.ecm

@@ -446,7 +446,7 @@ ESPrequest [nil_remove] WUQueryRequest
     [min_ver("1.03")] int64 PageSize(0);
     [min_ver("1.03")] int64 PageStartFrom(0);
     [min_ver("1.03")] int64 PageEndAt;
-    [min_ver("1.26")] int LastNDays;
+    [min_ver("1.26"), depr_ver("1.72")] int LastNDays;
 
     string Sortby;
     bool Descending(false);
@@ -481,7 +481,7 @@ ESPresponse [nil_remove, exceptions_inline] WUQueryResponse
     bool First(true);
     [min_ver("1.03")] int64 PageStartFrom(-1);
     [min_ver("1.03")] int64 PageEndAt;
-    [min_ver("1.26")] int LastNDays;
+    [min_ver("1.26"), depr_ver("1.72")] int LastNDays;
 
     string Sortby;
     bool Descending(false);

+ 1 - 1
esp/services/ws_workunits/ws_workunitsService.cpp

@@ -2514,7 +2514,7 @@ bool CWsWorkunitsEx::onWUQuery(IEspContext &context, IEspWUQueryRequest & req, I
         addToQueryString(basicQuery, "Owner", req.getOwner());
         addToQueryString(basicQuery, "StartDate", req.getStartDate());
         addToQueryString(basicQuery, "EndDate", req.getEndDate());
-        if (version > 1.25 && req.getLastNDays() > -1)
+        if (version >= 1.26 && version < 1.72 && req.getLastNDays() > -1)
             addToQueryString(basicQuery, "LastNDays", StringBuffer().append(req.getLastNDays()).str());
         addToQueryString(basicQuery, "ECL", req.getECL());
         addToQueryString(basicQuery, "Jobname", req.getJobname());