From 8226e74ffba3fd34643f9599673bc5700b2b4c5d Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Thu, 8 Aug 2013 21:26:30 +0000
Subject: [PATCH] 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
---
 fhem/FHEM/55_GDS.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm
index b6c8ffa1e..4cdbffec8 100644
--- a/fhem/FHEM/55_GDS.pm
+++ b/fhem/FHEM/55_GDS.pm
@@ -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;