From 023b21cc784ae79b1caff92925c608354554f53b Mon Sep 17 00:00:00 2001 From: borisneubert Date: Tue, 2 Sep 2014 10:16:51 +0000 Subject: [PATCH] reverted changes in addproperty to r6423 git-svn-id: https://svn.fhem.de/fhem/trunk@6499 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/57_Calendar.pm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/fhem/FHEM/57_Calendar.pm b/fhem/FHEM/57_Calendar.pm index c70b32eaf..8b10800a9 100644 --- a/fhem/FHEM/57_Calendar.pm +++ b/fhem/FHEM/57_Calendar.pm @@ -67,16 +67,12 @@ sub addproperty { my ($self,$line)= @_; # TRIGGER;VALUE=DATE-TIME:20120531T150000Z #main::Debug "line= $line"; - my ($property,$property1,$parameter); - ####### takes care of TZID, which has ":" in the property DTEND;TZID="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna":20140904T180000 - if ($line =~ m/TZID=/){ - ($property,$property1,$parameter)= split(":", $line,3); - $property .=$property1; - } - else { - ($property,$parameter)= split(":", $line,2); - } - ###### + # for DTSTART, DTEND there are several variants: + # DTSTART;TZID=Europe/Berlin:20140205T183600 + # * DTSTART;TZID="(UTC+01:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna":20140904T180000 + # DTSTART:20140211T212000Z + # DTSTART;VALUE=DATE:20130619 + my ($property,$parameter)= split(":", $line,2); # TRIGGER;VALUE=DATE-TIME 20120531T150000Z #main::Debug "property= $property parameter= $parameter"; my ($key,$parts)= split(";", $property,2); #main::Debug "key= $key parts= $parts";