mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed minus problem with times as perl function

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6492 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
damian-s
2014-08-31 18:17:44 +00:00
parent f9b9eaef76
commit c47ca41980
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fhem/FHEM/98_DOIF.pm
View File

@@ -310,18 +310,44 @@ DOIF_CheckTimers($$$$)
{
my $i=0;
my @nrs;
my @times;
my $nr;
my $days="";
my $err;
my ($hash,$block,$condition,$timerarray)=@_;
#if ($block =~ /^(([0-2][0-9](:[0-5][0-9]){1,2})|(\{.*\}))(-([0-2][0-9](:[0-5][0-9]){1,2})|-({.*})|$)/) {
if ($block =~ /^((\{.*\})|([0-2][0-9](:[0-5][0-9]){1,2}))(\|[0-8]+$|-([0-2][0-9](:[0-5][0-9]){1,2})|-({.*})|$)(\|[0-8]+$|$)/) {
my ($timer,$days)=split(/\|/,$block);
foreach my $time (split(/-/,$timer)) {
my $beginning;
my $pos;
my $time;
my $block;
my ($hash,$timer,$condition,$timerarray)=@_;
if ($timer =~ /^((\{.*\})|([0-2][0-9](:[0-5][0-9]){1,2}))(\|[0-8]+$|-([0-2][0-9](:[0-5][0-9]){1,2})|-({.*})|$)(\|[0-8]+$|$)/) {
while ($timer ne "") {
if ($timer=~ /^\s*\{/) {
($beginning,$time,$err,$timer)=GetBlockDoIf($timer,'[\{\}]');
return ($time,$err) if ($err);
$time="{".$time."}";
if ($timer =~ /^\s*\|/g) {
$pos=pos($timer);
$days=substr($timer,$pos);
$timer="";
}
} elsif ($timer =~ /-/g) {
$pos=pos($timer)-1;
$time=substr($timer,0,$pos);
$timer=substr($timer,$pos+1);
} else {
($time,$days)=split(/\|/,$timer);
$timer="";
}
$nr=$hash->{helper}{last_timer}++;
$times[$i]=$time;
$nrs[$i++]=$nr;
$timer=substr($timer,pos($timer)) if ($timer =~ /^\s*\-/g);
}
$days = "" if (!$days);
for (my $j=0; $j<$i;$j++) {
$nr=$nrs[$j];
$time=$times[$j];
$time .=":00" if ($time =~ m/^[0-2][0-9]:[0-5][0-9]$/);
$nr=$hash->{helper}{last_timer};
$nrs[$i]=$nr;
$i++;
$hash->{timer}{$nr}=0;
$hash->{time}{$nr}=$time;
$hash->{timeCond}{$nr}=$condition;
@@ -331,15 +357,11 @@ DOIF_CheckTimers($$$$)
return($hash->{time}{$nr},$err) if ($err);
$hash->{timers}{$condition}.=" $nr ";
$hash->{timerfunc}{$nr}=\${$timerarray}[$nr];
$nr++;
$hash->{helper}{last_timer}=$nr;
}
$days = "" if (!$days);
if ($i == 2) {
$block='DOIF_time($hash->{realtime}{'.$nrs[0].'},$hash->{realtime}{'.$nrs[1].'},$wday,$hms,"'.$days.'")';
} else {
$block='DOIF_time_once($hash->{timer}{'.$nrs[0].'},$wday,"'.$days.'")';
#$block=' $hash->{timer}{'.$nrs[0].'} ';
}
return ($block,"");
}