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

fhem.pl: GetTimeSpec: add sec-since-1970 (Forum #43612)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9809 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-11-07 18:39:08 +00:00
parent 44129207e7
commit 6ed002d589
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fhem/fhem.pl
View File

@@ -2908,29 +2908,32 @@ EvalSpecials($%)
} }
##################################### #####################################
# Parse a timespec: Either HH:MM:SS or HH:MM or { perfunc() } # Parse a timespec: HH:MM:SS, HH:MM, sec-since-1970 or { perfunc() }
sub sub
GetTimeSpec($) GetTimeSpec($)
{ {
my ($tspec) = @_; my ($tspec) = @_;
my ($hr, $min, $sec, $fn); my ($hr, $min, $sec, $fn);
if($tspec =~ m/^([0-9]+):([0-5][0-9]):([0-5][0-9])$/) { if($tspec =~ m/^([0-9]+):([0-5][0-9]):([0-5][0-9])$/) { # HH:MM:SS
($hr, $min, $sec) = ($1, $2, $3); ($hr, $min, $sec) = ($1, $2, $3);
} elsif($tspec =~ m/^([0-9]+):([0-5][0-9])$/) {
} elsif($tspec =~ m/^([0-9]+):([0-5][0-9])$/) { # HH:MM
($hr, $min, $sec) = ($1, $2, 0); ($hr, $min, $sec) = ($1, $2, 0);
} elsif($tspec =~ m/^{(.*)}$/) {
} elsif($tspec =~ m/^([0-9]{10})$/) { # seconds-since-1970
my @a = localtime($1);
($hr, $min, $sec) = ($a[2],$a[1],$a[0]);
} elsif($tspec =~ m/^{(.*)}$/) { # {function}
$fn = $1; $fn = $1;
$tspec = AnalyzeCommand(undef, "{$fn}"); $tspec = AnalyzeCommand(undef, "{$fn}");
if(!$@ && $tspec =~ m/^([0-9]+):([0-5][0-9]):([0-5][0-9])$/) {
($hr, $min, $sec) = ($1, $2, $3);
} elsif(!$@ && $tspec =~ m/^([0-9]+):([0-5][0-9])$/) {
($hr, $min, $sec) = ($1, $2, 0);
} else {
$tspec = "<empty string>" if(!$tspec); $tspec = "<empty string>" if(!$tspec);
return ("the at function \"$fn\" must return a timespec and not $tspec.", my ($err, $fn2);
undef, undef, undef, undef); ($err, $hr, $min, $sec, $fn2) = GetTimeSpec($tspec);
} return ("the function \"$fn\" must return a timespec and not $tspec.",
undef, undef, undef, undef) if($err);
} else { } else {
return ("Wrong timespec $tspec: either HH:MM:SS or {perlcode}", return ("Wrong timespec $tspec: either HH:MM:SS or {perlcode}",
undef, undef, undef, undef); undef, undef, undef, undef);