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

holiday: days parameter added. Forum #23695

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5894 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2014-05-19 10:09:42 +00:00
parent 1f8f119b28
commit fa63bb8368
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/95_holiday.pm
View File

@@ -201,19 +201,24 @@ holiday_Get($@)
my ($hash, @a) = @_;
shift(@a) if($a[1] && $a[1] eq "MM-DD");
return "argument is missing" if(int(@a) != 2);
return "argument is missing" if(int(@a) < 2);
my $arg;
if($a[1] =~ m/^[01]\d-[0-3]\d/) {
$arg = $a[1];
} elsif($a[1] =~ m/^yesterday|today|tomorrow$/) {
} elsif($a[1] =~ m/^(yesterday|today|tomorrow)$/) {
my $t = time();
$t += 86400 if($a[1] eq "tomorrow");
$t -= 86400 if($a[1] eq "yesterday");
my @a = localtime($t);
$arg = sprintf("%02d-%02d", $a[4]+1, $a[3]);
} elsif($a[1] eq "days") {
my $t = time() + ($a[2] ? int($a[2]) : 0)*86400;
my @a = localtime($t);
$arg = sprintf("%02d-%02d", $a[4]+1, $a[3]);
} else {
return "unknown argument $a[1], ".
"choose one of yesterday:noArg today:noArg tomorrow:noArg MM-DD";
@@ -349,6 +354,7 @@ western_easter($)
<code>get &lt;name&gt; yesterday</code><br>
<code>get &lt;name&gt; today</code><br>
<code>get &lt;name&gt; tomorrow</code><br>
<code>get &lt;name&gt; days <offset></code><br>
<br><br>
Return the holiday name of the specified date or the text none.
<br><br>
@@ -454,6 +460,7 @@ western_easter($)
<code>get &lt;name&gt; yesterday</code><br>
<code>get &lt;name&gt; today</code><br>
<code>get &lt;name&gt; tomorrow</code><br>
<code>get &lt;name&gt; days <offset></code><br>
<br><br>
Gibt den Name des Feiertages zum angebenenen Datum zur&uuml;ck oder den
Text none.