Merge branch 'candidate-7.8.x'

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

dockerfiles/platform-build-incremental/Dockerfile

@@ -27,6 +27,13 @@ RUN apt-get install -y \
     dnsutils \
     nano 
 
+# Set the locale
+RUN apt-get install -y locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8     
+
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
 
 USER hpcc

dockerfiles/platform-core-debug/Dockerfile

@@ -21,6 +21,13 @@ ARG BUILD_LABEL
 ARG DOCKER_REPO
 FROM ${DOCKER_REPO}/platform-build:${BUILD_LABEL}
 
+# Set the locale
+RUN apt-get install -y locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8     
+
 RUN apt-get install -y libcap2-bin
 RUN setcap cap_sys_ptrace+eip /usr/bin/gdb
 

dockerfiles/platform-core/Dockerfile

@@ -55,6 +55,13 @@ RUN apt-get install -y \
     dnsutils \
     nano 
 
+# Set the locale
+RUN apt-get install -y locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8  
+ENV LANGUAGE en_US:en  
+ENV LC_ALL en_US.UTF-8     
+
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin
 
 COPY --from=build /opt/HPCCSystems /opt/HPCCSystems

plugins/eeproxies/CMakeLists.txt

@@ -14,16 +14,16 @@
 #    limitations under the License.
 ################################################################################
 set (proxies_out_dir "plugins")
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_addrcleanlib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_bridgerscorelib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_canadacleanlib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_cmslib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_datalib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_addrcleanlib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_bridgerscorelib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_canadacleanlib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_cmslib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_datalib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
 install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_date.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_dmslib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_entityscorelib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_fingerprintlib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_hktlib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_namelib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_ofaclib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
-install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_ziplib.eclmod DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_dmslib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_entityscorelib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_fingerprintlib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_hktlib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_namelib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_ofaclib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)
+install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib_ziplib.ecllib DESTINATION ${proxies_out_dir} COMPONENT Runtime)

plugins/eeproxies/lib_addrcleanlib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) addrclean library */
 
-export AddrCleanLib := SERVICE : plugin('addrclean'),time
+export AddrCleanLib := SERVICE : plugin('addrcleanlib'),time
   string182 CleanAddress182(const string addrline, const string lastline, const string server = '', unsigned2 port = 0) : c, pure, context, entrypoint='aclCleanAddress182Ctx';
   string183 CleanAddress183(const string addrline, const string lastline, const string server = '', unsigned2 port = 0) : c, pure, context, entrypoint='aclCleanAddress183Ctx';
   string73 CleanPerson73(const string name, const string server = '', unsigned2 port = 0) : c, pure, context, entrypoint='aclCleanPerson73Ctx';

plugins/eeproxies/lib_bridgerscorelib.eclmod

@@ -22,7 +22,7 @@ export WLSearchResultRecord := record
   real8 score
 end;
 
-export BridgerScoreLib := SERVICE : plugin('bridgerscore'), time
+export BridgerScoreLib := SERVICE : plugin('bridgerscorelib'), time
   boolean IsLoaded() : c, entrypoint='wlIsLoaded';
   boolean Load(unsigned4 source, unsigned4 key, string givenName, string lastOrCompanyName, boolean isPerson, boolean last) : c, action,entrypoint='wlL    oad';
   Unload() : c, action, entrypoint='wlUnload';

plugins/eeproxies/lib_canadacleanlib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) canadaclean library */
 
-export CanadaCleanLib := SERVICE : plugin('canadaclean'),time
+export CanadaCleanLib := SERVICE : plugin('canadacleanlib'),time
   string109 CanadaAddress109(const string addrline, const string lastline, const string mode = 'I', const string server = 'canadacleanlb.br.seisint.com', unsigned2 port = 11300) : c, pure, entrypoint='cclCanadaAddress109';
   boolean SetTracing(boolean trace=true) : c,action,entrypoint='cclSetTracing';
 END;

plugins/eeproxies/lib_cmslib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) cms library */
 
-export cmsLib := SERVICE : plugin('cms')
+export cmsLib := SERVICE : plugin('cmslib')
   varstring GetBuildInfo() : c, pure, entrypoint='cmsGetBuildInfo';
   string100 GetBuildInfo100() : c, pure, entrypoint='cmsGetBuildInfo100', hole;
   integer4 ReasonCodeRank(string s, integer4 n, integer4 flag) : c, pure, entrypoint='cmsReasonCodeRank', hole;

plugins/eeproxies/lib_datalib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) data library */
 
-export DataLib := SERVICE:plugin('data'),fold
+export DataLib := SERVICE:plugin('datalib'),fold
   string261 AddressClean(const string address1, const string address2)  : c, pure, entrypoint='dataAddressClean', hole;
   string120 CompanyClean(const string scr)  : c, pure, entrypoint='dataCompanyClean', hole;
   string    DeDouble(const string scr)  : c, pure, entrypoint='dataDeDouble';

plugins/eeproxies/lib_dmslib.eclmod

@@ -17,6 +17,6 @@
 
 /* Proxy plugin definition for (EE only) dms library */
 
-export DMSLib := SERVICE : plugin('dms')
+export DMSLib := SERVICE : plugin('dmslib')
   string30    getVehDesc(const string number) : c, pure, entrypoint='getVehDesc', hole;
 END;

plugins/eeproxies/lib_entityscorelib.eclmod

@@ -19,7 +19,7 @@
 
 export TextSearchDataRecord := record varunicode indexWord; varunicode searchContext; end;
 export TextSearchResultRecord := record integer4 score; varunicode matchContext; end;
-export EntityScoreLib := SERVICE : plugin('entityscore'), time
+export EntityScoreLib := SERVICE : plugin('entityscorelib'), time
   integer4 AddressCompare(unicode streetOrFull1, unicode city1, unicode state1, unicode pcode1, unicode country1, unicode streetOrFull2, unicode city2, unicode state2, unicode pcode2, unicode country2) : c, pure, entrypoint='ESL_AddressCompare';
   integer4 AddressIndexWordCompare(unicode word1, unicode word2) : c, pure, entrypoint='ESL_AddressIndexWordCompare';
   integer4 CountryCompare(unicode country1, unicode country2) : c, pure, entrypoint='ESL_CountryCompare';

plugins/eeproxies/lib_fingerprintlib.eclmod

@@ -21,7 +21,7 @@ export KeyValueResultRecord := record
   string key{maxlength(4096)};
   string value{maxlength(1024)};
 end;
-export FingerprintLib := SERVICE : plugin('fingerprint'), time
+export FingerprintLib := SERVICE : plugin('fingerprintlib'), time
   string    getHtmlFingerprint(const string scr, const string tag_list, const string attr_exclude_list, boolean include_xml_text, boolean de_dup )  : c, pure, entrypoint='getHtmlFingerprint';
   string    getTagValueString (const string scr, const string tag_list, const string attr_exclude_list )  : c, pure, entrypoint='getTagValueString';
   dataset(KeyValueResultRecord) getTagValueDS(const string scr, const string tag_list, const string attr_exclude_list )  : c, pure, entrypoint='getTagValueDS';

plugins/eeproxies/lib_hktlib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) hkt library */
 
-export HktLib := SERVICE : plugin('hkt')
+export HktLib := SERVICE : plugin('hktlib')
   unsigned4 HKT_SB(const string inval) : c, pure, entrypoint='hktHKT_SB', hole;
   unsigned4 HKT_SU(const string inval) : c, pure, entrypoint='hktHKT_SU', hole;
   unsigned4 HKT_P(const string inval) : c, pure, entrypoint='hktHKT_P', hole;

plugins/eeproxies/lib_namelib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) name library */
 
-export NameLib := SERVICE:plugin('name'),fold
+export NameLib := SERVICE:plugin('namelib'),fold
   string    FirstNameToToken(const string20 name) : c, pure, entrypoint='nameFirstNameToToken';
   string20  TokenToFirstName(const string token) : c, pure, entrypoint='nameTokenToFirstName';
   unsigned4 TokenToLength(const string name) : c, pure, entrypoint='nameTokenToLength';

plugins/eeproxies/lib_ofaclib.eclmod

@@ -21,7 +21,7 @@ export OfacSearchResultRecord := record
   unsigned4 key;
   real8 score;
 end;
-export OfacLib := SERVICE : plugin('ofac')
+export OfacLib := SERVICE : plugin('ofaclib')
   boolean IsLoaded() : c, entrypoint='ofacIsLoaded';
   boolean Load(unsigned4 source, unsigned4 key, string givenName, string lastOrCompanyName, boolean isPerson, boolean last) : c, action,entrypoint='ofacLoad';
   Unload() : c, action, entrypoint='ofacUnload';

plugins/eeproxies/lib_ziplib.eclmod

@@ -17,7 +17,7 @@
 
 /* Proxy plugin definition for (EE only) zip library */
 
-export ZipLib := SERVICE:plugin('zip'),fold
+export ZipLib := SERVICE:plugin('ziplib'),fold
   string21 ZipToGeo21(const string zip) : c,pure,entrypoint='zlZipToGeo21', hole;
   string   ZipToCities(const string zip) : c,pure,entrypoint='zlZipToCities';
   string2  ZipToState2(const string zip) : c,pure,entrypoint='zlZipToState2', hole;