2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00

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

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

View File

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