Browse Source

Merge pull request #10772 from wangkx/h18761

HPCC-18761 Deprecate FileName in WsDFU.DFUInfo request

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 7 years ago
parent
commit
061e7e311e
2 changed files with 9 additions and 5 deletions
  1. 2 3
      esp/scm/ws_dfu.ecm
  2. 7 2
      esp/services/ws_dfu/ws_dfuService.cpp

+ 2 - 3
esp/scm/ws_dfu.ecm

@@ -295,9 +295,8 @@ DFUInfoRequest
 {
     string Name;
     string Cluster;
-    //string NewDescription;
     bool UpdateDescription(false);
-    string FileName;
+    [depr_ver("1.38")] string FileName;
     string FileDesc;
     [min_ver("1.37")] bool IncludeJsonTypeInfo(false);
     [min_ver("1.37")] bool IncludeBinTypeInfo(false);
@@ -780,7 +779,7 @@ ESPresponse [exceptions_inline, nil_remove] EraseHistoryResponse
 //  ===========================================================================
 ESPservice [
     auth_feature("DEFERRED"),
-    version("1.37"),
+    version("1.38"),
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
 {

+ 7 - 2
esp/services/ws_dfu/ws_dfuService.cpp

@@ -350,8 +350,13 @@ bool CWsDfuEx::onDFUInfo(IEspContext &context, IEspDFUInfoRequest &req, IEspDFUI
 
         if (req.getUpdateDescription())
         {
-            doGetFileDetails(context, userdesc.get(), req.getFileName(), req.getCluster(), req.getFileDesc(),
-                             req.getIncludeJsonTypeInfo(), req.getIncludeBinTypeInfo(), resp.updateFileDetail());
+            double version = context.getClientVersion();
+            if (version < 1.38)
+                doGetFileDetails(context, userdesc.get(), req.getFileName(), req.getCluster(), req.getFileDesc(),
+                    req.getIncludeJsonTypeInfo(), req.getIncludeBinTypeInfo(), resp.updateFileDetail());
+            else
+                doGetFileDetails(context, userdesc.get(), req.getName(), req.getCluster(), req.getFileDesc(),
+                    req.getIncludeJsonTypeInfo(), req.getIncludeBinTypeInfo(), resp.updateFileDetail());
         }
         else
         {