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

55_GDS.pm: add error message for stations list

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@11108 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2016-03-21 08:20:57 +00:00
parent 156255627f
commit e11a73f5e0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/55_GDS.pm
View File

@@ -421,9 +421,8 @@ sub GDS_Set($@) {
} }
when("conditions"){ when("conditions"){
CommandAttr(undef, "$name gdsSetCond $parameter");
# $attr{$name}{gdsSetCond} = $parameter; #ReadingsVal($name,'c_stationName',undef);
return "conditions no longer available after 15.03.2016" if (time > 1457996400); return "conditions no longer available after 15.03.2016" if (time > 1457996400);
CommandAttr(undef, "$name gdsSetCond $parameter");
GDS_GetUpdate($hash,'set conditions'); GDS_GetUpdate($hash,'set conditions');
break; break;
} }
@@ -448,9 +447,10 @@ sub GDS_Get($@) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $usage = "Unknown argument $command, choose one of help:noArg rereadcfg:noArg ". my $usage = "Unknown argument $command, choose one of help:noArg rereadcfg:noArg ".
"list:stations,capstations,data ". # "list:stations,capstations,data ".
"list:capstations,data ".
"alerts:".$aList." ". "alerts:".$aList." ".
"conditions:".$sList." ". # "conditions:".$sList." ".
"conditionsmap:".$cmapList." ". "conditionsmap:".$cmapList." ".
"forecasts:".$fcList." ". "forecasts:".$fcList." ".
"forecastsmap:".$fmapList." ". "forecastsmap:".$fmapList." ".
@@ -532,6 +532,7 @@ sub GDS_Get($@) {
$result = getListCapStations($hash,$parameter); } $result = getListCapStations($hash,$parameter); }
when("data") { $result = latin1ToUtf8(join("\n",@allConditionsData)); } # new when("data") { $result = latin1ToUtf8(join("\n",@allConditionsData)); } # new
when("stations") { when("stations") {
return "stations list no longer available after 15.03.2016" if (time > 1457996400);
my @a = map (latin1ToUtf8(substr($_,0,19)), @allConditionsData); my @a = map (latin1ToUtf8(substr($_,0,19)), @allConditionsData);
unshift(@a, "Use one of the following stations:", sepLine(40)); unshift(@a, "Use one of the following stations:", sepLine(40));
$result = join("\n",@a); $result = join("\n",@a);