Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.8-rc1 Release Candidate 1

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11901 CSV auto discovery generates wrong field names if
recordstructurepresent=false

Fix record structure generation.

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>
Merge pull request #6232 from AttilaVamos/HPCC-11901-fix

HPCC-11901 CSV auto discovery generates wrong field names if recordstructurepresent=false

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11912 DOCS:Roxie now supports superfile with >1 subfile

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
HPCC-11587 Add 'Open In New Page' to Package Map area

The code for the Package Map display is upgraded to support
the function of 'Open In New Page'.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'closedown-4.2.x' into candidate-4.2.8

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.8-rc2 Release Candidate 2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Revert "HPCC-11903 Update Docs for scripts that write to logs"
Merge branch 'closedown-5.0.x' of https://github.com/hpcc-systems/HPCC-Platform into 11912DOCSRoxieSuperWithMoreThan1sub
Merge pull request #6250 from hpcc-systems/revert-6235-11903UpdateDocsScripts

Revert "HPCC-11903 Update Docs for scripts that write to logs"

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11932 Roxie attach causing Roxie cluster to load empty package

The onReconnect calls are supposed to reload from new information in dali, but
becuase of the isConnected being set AFTER the onReconnects, and the iniCache
happening before, the onReconnect was liable to reload from the empty cache
information.

The cache should not be cleared on reconnects (only needed on the initial
connect, and that can be handled more cleanly by calling loadCache in
writeCache). The isConnected needs to be set earlier - it was moved recently,
I believe just because it seemed like a good idea... Added a comment to
explain why it needs to be where it is.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11912 Docs Roxie superfile support updates

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
Merge pull request #6254 from richardkchapman/roxie-losing-state

HPCC-11932 Roxie attach causing Roxie cluster to load empty package

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-11587 Revise based on review comments

1. Removed 3 groups of 'initalized' lines;
2. Switch to the deferred/promise style: added 'then' functions;
Moved data processing code from old callback functions to the
'then' functions; Changed 'error' branch args;
3. Removed ESP Exception handling code since the exceptions
have been handled inside the ESPRequest.js. Also removed the
code for checking the status code of ESP response since the
status code has not been used to indicate an error.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
HPCC-11587 Remove extra lines and add return statements

Those changes are based on the last review comments for better
coding practice.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
HPCC-11938 Fix incorrect Number of Queries from WUListQueries

Existing WsWorkunits.WUListQueries returns incorrect Number of Queries.
The bug is fixed now.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
Merge pull request #6238 from wangkx/h11587

HPCC-11587 Add 'Open In New Page' to Package Map area

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6261 from wangkx/h11938

HPCC-11938 Fix incorrect Number of Queries from WUListQueries

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>