FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

changed: improved "get <name> warnings" to retrieve all existing VHDL30-VHDL33 for selected region

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3632 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2013-08-08 21:26:30 +00:00
parent 471bd1be4b
commit 8226e74ffb
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/55_GDS.pm
View File

@ -323,11 +323,14 @@ sub GDS_Get($@) {
}
when("warnings"){
(undef, $found) = retrieveFile($hash, $command, $parameter);
if($found){
$result = retrieveTextWarn($hash,@a);
} else {
$result = "Keine Warnmeldung für $parameter gefunden.";
my $vhdl;
$result= "Warnlageberichte für $parameter";
for ($vhdl=30; $vhdl <=33; $vhdl++){
(undef, $found) = retrieveFile($hash, $command, $parameter, $vhdl);
if($found){
$result .= "\n".sepLine(70);
$result .= retrieveTextWarn($hash,@a);
}
}
break;
}
@ -696,12 +699,12 @@ sub retrieveConditions($$@){
return ;
}
sub retrieveFile($$;$){
sub retrieveFile($$;$$){
#
# request = type, e.g. alerts, conditions, warnings
# parameter = additional selector, e.g. Bundesland
#
my ($hash, $request, $parameter) = @_;
my ($hash, $request, $parameter, $parameter2) = @_;
my $name = $hash->{NAME};
my $loglevel = GetLogLevel($name,3);
my $user = $hash->{helper}{USER};
@ -731,7 +734,7 @@ sub retrieveFile($$;$){
when("warnings"){
$dwd = $bula2dwd{$parameter};
$dir = $dwd2Dir{$dwd};
$dwd = "VHDL30_".$dwd."*";
$dwd = "VHDL".$parameter2."_".$dwd."*";
$dir = "gds/specials/warnings/".$dir."/";
$targetFile = "/tmp/".$request;
break;