Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-…

…9.8.x
hpcc-systems · Feb 6, 2025 · efecd3d · efecd3d
2 parents b8ca860 + 3f4002a
commit efecd3d
Show file tree

Hide file tree

Showing 13 changed files with 4,415 additions and 2,560 deletions.
diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml
@@ -212,6 +212,5 @@ jobs:
     with:
       os: macos-13
       build-type: 'Release'
-      cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DUSE_PARQUET=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
+      cmake-configuration-ex: '-DUSE_CPPUNIT=OFF -DCLIENTTOOLS_ONLY=ON -DINCLUDE_PLUGINS=OFF -DUSE_AZURE=OFF -DUSE_CASSANDRA=OFF -DSUPPRESS_CASSANDRAEMBED=ON -DUSE_JAVA=OFF -DUSE_OPENLDAP=OFF'
     secrets: inherit
-
diff --git a/esp/clients/wsdfuaccess/wsdfuaccess.cpp b/esp/clients/wsdfuaccess/wsdfuaccess.cpp
@@ -464,6 +464,11 @@ IPropertyTree *createDFUFileMetaInfo(const char *fileName, IFileDescriptor *file
     Owned<IPropertyTree> metaInfo = createPTree();
 
     metaInfo->setProp("logicalFilename", fileName);
+
+    // "group" is for info. only. dafilesrv's may use it to show context in error messages.
+    const char *fileGroup = fileDesc->queryProperties().queryProp("@group");
+    metaInfo->setProp("group", nullText(fileGroup)); // NB: should never be missing
+
     if (!isEmptyString(requestId))
         metaInfo->setProp("requestId", requestId);
     metaInfo->setProp("accessType", accessType);

diff --git a/esp/src/index.html b/esp/src/index.html
@@ -10,7 +10,6 @@
     <script src="/esp/files/node_modules/es6-promise/dist/es6-promise.auto.min.js"></script>
     <link rel="stylesheet" href="/esp/files/dist/font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/esp/files/img/favlogo.png">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
     <style>
         body {
             padding: 0px;