integrated a bugfix for tclrega and tclrpc which will always convert all

input data to iso-8859-1 encoding rather than just in case the identity encoding is not used. This should fix certain umlaut encoding issues that could either be seen in the WebUI when renaming devices/channels, but also when using the rega scripting or rpc api with remote calls and utf-8 encoded names containing umlaut characters. This fixes #1821.
jens-maus · May 3, 2022 · 5e0ab71 · 5e0ab71
1 parent b101d91
commit 5e0ab71
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/buildroot-external/package/tclrega/tclrega.cpp b/buildroot-external/package/tclrega/tclrega.cpp
@@ -30,7 +30,7 @@
 /*# Definitionen                                                             #*/
 /*############################################################################*/
 
-#define TCLREGA_VERSION "1.2"
+#define TCLREGA_VERSION "1.3"
 
 /*############################################################################*/
 /*# Variablen                                                                #*/
@@ -141,11 +141,9 @@ int Tclrega_Init (Tcl_Interp* interp) {
   /* - - - wernerf - - - */
 	Tcl_SetVar(interp, "rega_version", TCLREGA_VERSION, TCL_GLOBAL_ONLY);
 
-	// get the system encoding and then convert to iso8859-1 in
-	// case the system encoding is not "identity"
-	if(strcasecmp(Tcl_GetEncodingName(NULL), "identity") != 0) {
-	  iso8859_encoding = Tcl_GetEncoding(interp, "iso8859-1");
-	}
+	// get iso8859-1 encoding to convert all stuff to latin1
+	// because rega can only handle iso-8859-1
+	iso8859_encoding = Tcl_GetEncoding(interp, "iso8859-1");
 
 	// create an exit handler to clean up afterwards
 	Tcl_CreateExitHandler( Tclrega_Exit, 0 );

diff --git a/buildroot-external/package/tclrega/tclrega.mk b/buildroot-external/package/tclrega/tclrega.mk
@@ -7,7 +7,7 @@
 #
 ################################################################################
 
-TCLREGA_VERSION = 1.2
+TCLREGA_VERSION = 1.3
 TCLREGA_SITE = $(BR2_EXTERNAL_EQ3_PATH)/package/tclrega
 TCLREGA_SITE_METHOD = local
 TCLREGA_LICENSE = Apache-2.0

diff --git a/buildroot-external/package/tclrpc/tclrpc.cpp b/buildroot-external/package/tclrpc/tclrpc.cpp
@@ -23,7 +23,7 @@
 
 using namespace XmlRpc;
 
-#define TCLRPC_VERSION "1.2"
+#define TCLRPC_VERSION "1.3"
 
 static const char* USAGE = "usage: xmlrpc url methodName ?arg1 ?arg2 ...??";
 
@@ -60,11 +60,9 @@ int DLLEXPORT Tclrpc_Init (Tcl_Interp* interp) {
 	Tcl_CreateExitHandler( Tclrpc_Exit, 0 );
     XmlRpc::XmlRpcErrorHandler::setErrorHandler( &g_tclrpcErrorHandler );
 
-	// get the system encoding and then convert to iso8859-1 in
-	// case the system encoding is not "identity"
-	if(strcasecmp(Tcl_GetEncodingName(NULL), "identity") != 0) {
-	  iso8859_encoding = Tcl_GetEncoding(interp, "iso8859-1");
-	}
+	// get iso8859-1 encoding to convert all stuff to latin1
+	// because rega can only handle iso-8859-1
+	iso8859_encoding = Tcl_GetEncoding(interp, "iso8859-1");
 
 	return TCL_OK;
 }

diff --git a/buildroot-external/package/tclrpc/tclrpc.mk b/buildroot-external/package/tclrpc/tclrpc.mk
@@ -7,7 +7,7 @@
 #
 ################################################################################
 
-TCLRPC_VERSION = 1.2
+TCLRPC_VERSION = 1.3
 TCLRPC_SITE = $(BR2_EXTERNAL_EQ3_PATH)/package/tclrpc
 TCLRPC_SITE_METHOD = local
 TCLRPC_LICENSE = Apache-2.0