فهرست منبع

Merge branch 'candidate-5.2.4' into candidate-5.4.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 10 سال پیش
والد
کامیت
a11213fac6

+ 1 - 1
docs/ECLProgrammersGuide/PRG_Mods/PrG_Automated_ECL.xml

@@ -50,7 +50,7 @@ PG.DeclareData.MAC_CountFieldValues(PG.DeclareData.Person.file,gender);
   correctly, you can automate the process by using ECLplus.</para>
 
   <para>Install the ECLplus program in its own directory on the same PC that
-  runs the ECL IDE, and create an ECLPLUS.INI file with the correct settings
+  runs the ECL IDE, and create an ECLPLUS.INI file in the same folder with the correct settings
   to access your cluster (see the <emphasis>Command Line ECL</emphasis>
   section of the <emphasis>Client Tools </emphasis>PDF). Then you can open a
   Command Prompt window and run the same query from the command line like

+ 1 - 1
docs/ECLProgrammersGuide/PRG_Mods/PrG_Workwith_Blobs.xml

@@ -23,7 +23,7 @@
     <para>In the HPCCClientTools.PDF there is a chapter devoted to the
     DFUplus.exe program. This is a command line tool with specific options
     that allow you to spray and despray files into BLOBs in the HPCC. In all
-    the examples below, we'll assume you have a DFUPLUS.INI file containing
+    the examples below, we'll assume you have a DFUPLUS.INI file in the same folder as the executable containing
     the standard content described in that section of the PDF.</para>
 
     <para>The key to making a spray operation write to BLOBs is the use of the

+ 12 - 9
docs/HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml

@@ -62,8 +62,8 @@
                 <entry>Optional. The name of a file containing necessary
                 <emphasis>options</emphasis>. If omitted and no command line
                 <emphasis>options</emphasis> are specified, the appropriate
-                <emphasis>options</emphasis> must be in the dfuplus.ini
-                file.</entry>
+                <emphasis>options</emphasis> must be in the dfuplus.ini file
+                in the same directory as the executable.</entry>
               </row>
 
               <row>
@@ -74,7 +74,8 @@
                 <emphasis>operation</emphasis> being executed. If omitted and
                 no <emphasis>@filename</emphasis> is specified, the
                 appropriate <emphasis>options</emphasis> must be in the
-                dfuplus.ini file.</entry>
+                dfuplus.ini file in the same directory as the
+                executable.</entry>
               </row>
             </tbody>
           </tgroup>
@@ -84,7 +85,8 @@
         command line parameters to send to the Distributed File Utility (DFU)
         engine via the ESP server. These <emphasis>options</emphasis> can be
         specified on the command line, in the <emphasis>@filename</emphasis>,
-        in the dfuplus.ini file, or any combination.</para>
+        in the dfuplus.ini file in the same directory as the executable, or
+        any combination.</para>
 
         <para>Evaluation of options follows this order of precedence:</para>
 
@@ -283,9 +285,10 @@
           <title>dfuplus.ini</title>
 
           <para>Any <emphasis>options</emphasis> can be specified in a file
-          called dfuplus.ini. If your operating system is case-sensitive, make
-          sure the filename is in lowercase. Options that rarely change can be
-          put in the dfuplus.ini file. For example:</para>
+          called dfuplus.ini in the same directory as the executable. If your
+          operating system is case-sensitive, make sure the filename is in
+          lowercase. Options that rarely change can be put in the dfuplus.ini
+          file. For example:</para>
 
           <programlisting>server=http://10.150.50.12:8010
 username=rlor
@@ -706,13 +709,13 @@ dfuplus action=dspray srcname=le::imagedb
           from all the nodes of the cluster), typically from one cluster to
           another. It appropriately handles re-distributing the file parts if
           the source and destination clusters do not have the same number of
-          nodes. </para>
+          nodes.</para>
 
           <para>The copy operation can also be used to copy files from other
           HPCC environments (using the <emphasis>srcdali</emphasis> option).
           This is also known as a remote copy. For a remote copy of a file
           that contains a variable length field, you must include the
-          <emphasis role="bold">nosplit</emphasis> option. </para>
+          <emphasis role="bold">nosplit</emphasis> option.</para>
 
           <para>These <emphasis>options </emphasis>are used by the <emphasis
           role="bold">copy</emphasis> <emphasis>operation</emphasis>:</para>

+ 6 - 5
docs/HPCCClientTools/CT_Mods/CT_Comm_Line_ECL.xml

@@ -165,16 +165,17 @@
         command line parameters to send directly to an ECL execution engine.
         These options can be typed directly on the command line, sent using a
         script or batch file, through an <emphasis role="bold">ini</emphasis>
-        file, or any combination.</para>
+        file in the same directory as the executable, or any
+        combination.</para>
 
         <sect3 role="brk">
           <title>eclplus.ini</title>
 
           <para>All the options can be put directly on the command line, or
-          placed in a file called eclplus.ini. If your operating system is
-          case-sensitive, make sure the filename is in lowercase. Options that
-          do not change very often can be put in the ini file. For
-          example:</para>
+          placed in a file called eclplus.ini in the same directory as the
+          executable. If your operating system is case-sensitive, make sure
+          the filename is in lowercase. Options that do not change very often
+          can be put in the ini file. For example:</para>
 
           <programlisting>server=10.150.50.12
 cluster=training

+ 3 - 3
docs/HPCCClientTools/CT_Mods/CT_ECL_CLI.xml

@@ -149,9 +149,9 @@
           <title>ecl.ini</title>
 
           <para>Many options can be placed in a file called <emphasis
-          role="bold">ecl.ini</emphasis> in the local directory. Options that
-          do not change very often should be put in the ini file. For
-          example:</para>
+          role="bold">ecl.ini</emphasis> in the same directory as the
+          executable. Options that do not change very often should be put in
+          the ini file. For example:</para>
 
           <programlisting>eclWatchIP=10.150.50.12
 eclWatchPort=28010

+ 1 - 0
esp/src/eclwatch/WUQueryWidget.js

@@ -208,6 +208,7 @@ define([
         //  Implementation  ---
         getFilter: function () {
             var retVal = this.filter.toObject();
+            retval.Wuid =  retVal.Wuid.toUpperCase().trim();
             if (retVal.StartDate && retVal.FromTime) {
                 lang.mixin(retVal, {
                     StartDate: this.getISOString("FromDate", "FromTime")