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

added get commands yesterday/tommorrow

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@1555 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-05-12 07:57:49 +00:00
parent 1a0915d783
commit 068f70fe81
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FHEM/95_holiday.pm
View File

@@ -197,8 +197,23 @@ holiday_Get($@)
my ($hash, @a) = @_; my ($hash, @a) = @_;
return "argument is missing" if(int(@a) != 2); return "argument is missing" if(int(@a) != 2);
return "wrong argument: need MM-DD" if($a[1] !~ m/^[01]\d-[0-3]\d$/); my $arg;
return holiday_refresh($hash->{NAME}, $a[1]);
if($a[1] =~ m/^[01]\d-[0-3]\d/) {
$arg = $a[1];
} 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]);
} else {
return "wrong argument: need MM-DD/yesterday/today/tomorrow"
}
return holiday_refresh($hash->{NAME}, $arg);
} }
sub sub

5
docs/commandref.html
View File

@@ -8838,7 +8838,10 @@ KlikAanKlikUit, NEXA, CHACON, HomeEasy UK. <br> You need to define an RFXtrx433
<a name="holidayget"></a> <a name="holidayget"></a>
<b>Get</b> <b>Get</b>
<ul> <ul>
<code>get &lt;name&gt; &lt;MM-DD&gt;</code> <code>get &lt;name&gt; &lt;MM-DD&gt;</code><br>
<code>get &lt;name&gt; yesterday</code><br>
<code>get &lt;name&gt; today</code><br>
<code>get &lt;name&gt; tomorrow</code><br>
<br><br> <br><br>
Return the holiday name of the specified date or the text none. Return the holiday name of the specified date or the text none.
<br><br> <br><br>