Merge remote-tracking branch 'origin/closedown-4.2.x'

Conflicts:
	esp/files/scripts/HPCCPlatformWidget.js
	esp/files/templates/QuerySetQueryWidget.html

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

dali/sasha/saarch.cpp

@@ -73,6 +73,8 @@ static void mkDateCompare(bool dfu,const char *dt,StringBuffer &out,char fill)
             else
                 out.append(fill);
         out.append('-');
+        if (dt[i]) // skip '-'
+            i++;
         while (dt[i]||(out.length()<16))
             if (dt[i])
                 out.append(dt[i++]);

docs/ECLStandardLibraryReference/SLR-Mods/Copy.xml

@@ -21,7 +21,11 @@
   <emphasis>,allowoverwrite</emphasis> <emphasis role="bold">]</emphasis>
   <emphasis role="bold"> [</emphasis> <emphasis>,replicate</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,asSuperfile</emphasis>
-  <emphasis role="bold">] );</emphasis><emphasis></emphasis></para>
+  <emphasis role="bold">] [</emphasis> <emphasis>,compress</emphasis>
+  <emphasis role="bold">] [</emphasis> <emphasis>,forcePush</emphasis>
+  <emphasis role="bold">] [</emphasis>
+  <emphasis>,transferBufferSize</emphasis> <emphasis
+  role="bold">]);</emphasis><emphasis></emphasis></para>
 
   <para><emphasis>dfuwuid</emphasis> <emphasis role="bold"> :=
   STD.File.fCopy<indexterm>
@@ -41,7 +45,11 @@
   <emphasis>,allowoverwrite</emphasis> <emphasis role="bold">]</emphasis>
   <emphasis role="bold"> [</emphasis> <emphasis>,replicate</emphasis>
   <emphasis role="bold">] [</emphasis> <emphasis>,asSuperfile</emphasis>
-  <emphasis role="bold">] );</emphasis></para>
+  <emphasis role="bold">] [</emphasis> <emphasis>,compress</emphasis>
+  <emphasis role="bold">] [</emphasis> <emphasis>,forcePush</emphasis>
+  <emphasis role="bold">] [</emphasis>
+  <emphasis>,transferBufferSize</emphasis> <emphasis
+  role="bold">]);</emphasis></para>
 
   <informaltable colsep="1" frame="all" rowsep="1">
     <tgroup cols="2">
@@ -135,9 +143,32 @@
         </row>
 
         <row>
+          <entry><emphasis>compress</emphasis></entry>
+
+          <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
+          LZW compress the new file. If omitted, the default is FALSE.</entry>
+        </row>
+
+        <row>
+          <entry><emphasis>forcePush </emphasis></entry>
+
+          <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
+          execute the copy process on the source nodes and push to the targets
+          instead of executing on the targets and pulling from the source. If
+          omitted, the default is FALSE.</entry>
+        </row>
+
+        <row>
+          <entry><emphasis>transferBufferSize </emphasis></entry>
+
+          <entry>Optional. An integer value to override the DFU Server's
+          buffer size value (default is 64k)</entry>
+        </row>
+
+        <row>
           <entry><emphasis>dfuwuid</emphasis></entry>
 
-          <entry>The attribute name to recieve the null-terminated string
+          <entry>The attribute name to receive the null-terminated string
           containing the DFU workunit ID (DFUWUID) generated for the
           job.</entry>
         </row>
@@ -145,7 +176,7 @@
         <row>
           <entry>Return:<emphasis> </emphasis></entry>
 
-          <entry>fCopy returns a null-terminated string containing the DFU
+          <entry>Copy returns a null-terminated string containing the DFU
           workunit ID (DFUWUID).</entry>
         </row>
       </tbody>

docs/HPCCClientTools/CT_Mods/CT_ECL_IDE.xml

@@ -570,6 +570,12 @@
             </tgroup>
           </informaltable>
 
+          <para>An <emphasis role="bold">Override Automatic Compiler
+          Selection</emphasis> checkbox is available should you want to
+          override the default compiler selection, or location. Use this
+          option if you are using multiple versions of the client tools or if
+          you installed the compiler in a different location.</para>
+
           <informaltable colsep="0" frame="none" rowsep="0">
             <tgroup cols="2">
               <colspec align="left" colwidth="122.40pt" />

esp/files/scripts/HPCCPlatformWidget.js

@@ -147,7 +147,7 @@ define([
 
             this.createStackControllerTooltip(this.id + "_ECL", this.i18n.ECL);
             this.createStackControllerTooltip(this.id + "_Files", this.i18n.files);
-            this.createStackControllerTooltip(this.id + "_Queries", this.i18n.publishedQueries);
+            this.createStackControllerTooltip(this.id + "_RoxieQueries", this.i18n.publishedQueries);
             this.createStackControllerTooltip(this.id + "_OPS", this.i18n.operations);
             this.initTab();
         },

esp/files/scripts/QuerySetQueryWidget.js

@@ -89,7 +89,7 @@ define([
 
         postCreate: function (args) {
             this.inherited(arguments);
-            this.queriesTab = registry.byId(this.id + "_Queries");
+            this.queriesTab = registry.byId(this.id + "_PublishedQueries");
             this.clusterTargetSelect = registry.byId(this.id + "ClusterTargetSelect");
             this.borderContainer = registry.byId(this.id + "BorderContainer");
         },

esp/files/templates/HPCCPlatformWidget.html

@@ -35,7 +35,7 @@
             </div>
             <div id="${id}_Files" data-dojo-props="iconClass: 'iconLandingZone', showLabel: false" data-dojo-type="HPCCPlatformFilesWidget">
             </div>
-            <div id="${id}_Queries" data-dojo-props="iconClass: 'iconTargets', showLabel: false" data-dojo-type="HPCCPlatformRoxieWidget">
+            <div id="${id}_RoxieQueries" data-dojo-props="iconClass: 'iconTargets', showLabel: false" data-dojo-type="HPCCPlatformRoxieWidget">
             </div>
             <div id="${id}_OPS" data-dojo-props="iconClass: 'iconOperations', showLabel: false" data-dojo-type="HPCCPlatformOpsWidget">
             </div>

esp/files/templates/QuerySetQueryWidget.html

@@ -1,7 +1,7 @@
 <div class="${baseClass}">
 	<div id="${id}BorderContainer" class="${baseClass}BorderContainer" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.BorderContainer">
 		<div id="${id}TabContainer" data-dojo-props="region: 'center', tabPosition: 'top'" style="width: 100%; height: 100%" data-dojo-type="dijit.layout.TabContainer">
-			<div id="${id}_Queries" style="width: 100%; height: 100%" data-dojo-props="title:'${i18n.title}', iconClass:'iconCluster'" data-dojo-type="dijit.layout.BorderContainer">
+			<div id="${id}_PublishedQueries" style="width: 100%; height: 100%" data-dojo-props="title:'${i18n.title}', iconClass:'iconCluster'" data-dojo-type="dijit.layout.BorderContainer">
 				<div id="${id}QueryToolbar" class="topPanel" data-dojo-props="region: 'top'" data-dojo-type="dijit.Toolbar">
 					<div id="${id}Refresh" data-dojo-attach-event="onClick:_onRefresh" data-dojo-type="dijit.form.Button" data-dojo-props='iconClass:"iconRefresh"'>${i18n.Refresh}</div>
 					<span data-dojo-type="dijit.ToolbarSeparator"></span>