From 44148b0814527945b25cb00fc4cf1e9a99bd3963 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 5 Mar 2015 08:12:21 +0000 Subject: [PATCH] 10_ZWave.pm: Fix config shortening alg (Forum #34505) git-svn-id: https://svn.fhem.de/fhem/trunk@8153 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_ZWave.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index dec38347c..ebf622f27 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -810,11 +810,17 @@ sub ZWave_cleanString($$) { my ($c, $postfix) = @_; + my $shortened = 0; + $c =~ s/^[0-9.]+ //g; + $c =~ s/Don.t/Dont/g; # Bugfix + if($c =~ m/^(.+)\.(.+)$/ && $2 !~ m/^[ \d]+$/) { # delete second sentence + $c = $1; $shortened++; + } $c =~ s/[^A-Z0-9]+/ /ig; + $c =~ s/ *$//g; $c =~ s/ (.)/uc($1)/gei; - my $shortened=0; - while(length($c) > 32) { # might be endless loop + while(length($c) > 32 && $shortened < 999) { $c =~ s/[A-Z][^A-Z]*$//; $shortened++; }