From ae76b59f01b546c8b82d12082b575fb14ad9e3f9 Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Wed, 25 Nov 2015 12:28:32 +0000
Subject: [PATCH] =?UTF-8?q?55=5FGDS.pm:=20new=20command=20get=20=E2=80=A6?=
 =?UTF-8?q?=20headlines?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.fhem.de/fhem/trunk@10002 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED        |  5 +++--
 fhem/FHEM/55_GDS.pm | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index a37d33c45..e3ee499a0 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,7 +1,8 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
-  - bugfix: YAMAHA_BD: fix power off events when player is turned on
-            via set command on
+  - feature: 55_GDS: new command get <name> headlines [separator]
+  - bugfix:  YAMAHA_BD: fix power off events when player is turned on
+             via set command on
   - bugfix:  95_Dashboard: fixed javascript bug causing tabs not to load
   - feature: 36_DavisVantage.zip (author: "habeIchVergessen")
              Receive Davis Vantage Weather Stations with JeeLink 
diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm
index 859213af9..b65301eef 100644
--- a/fhem/FHEM/55_GDS.pm
+++ b/fhem/FHEM/55_GDS.pm
@@ -417,6 +417,7 @@ sub GDS_Get($@) {
 				"conditionsmap:".$cmapList." ".
 				"forecasts:".$fcList." ".
 				"forecastsmap:".$fmapList." ".
+				"headlines ".
 				"radarmap:".$cmapList." ".
 				"warningsmap:"."Deutschland,Bodensee,".$bulaList." ".
 				"warnings:".$bulaList;
@@ -454,6 +455,11 @@ sub GDS_Get($@) {
 			break;
 		}
 
+		when("headlines"){
+			$parameter //= "|";
+			return gdsHeadlines($name,$parameter);
+		}
+
 		when("warningsmap"){
 			# retrieve map: warnings
 			if(length($parameter) != 2){
@@ -2196,24 +2202,25 @@ sub getListForecastStations($) {
 		<ul>Retrieve current conditions at selected station</ul>
 		<br/>
 
-		<code>get &lt;name&gt; forecasts &lt;region&gt;</code>
-		<br/><br/>
-		<ul>Retrieve forecasts for today and the following 3 days for selected region as text</ul>
-		<br/>
-
 		<code>get &lt;name&gt; conditionsmap &lt;region&gt;</code>
 		<br/><br/>
 		<ul>Retrieve map (imagefile) showing current conditions at selected station</ul>
 		<br/>
 
+		<code>get &lt;name&gt; forecasts &lt;region&gt;</code>
+		<br/><br/>
+		<ul>Retrieve forecasts for today and the following 3 days for selected region as text</ul>
+		<br/>
+
 		<code>get &lt;name&gt; forecastsmap &lt;stationName&gt;</code>
 		<br/><br/>
 		<ul>Retrieve map (imagefile) showing forecasts for selected region</ul>
 		<br/>
 
-		<code>get &lt;name&gt; headlines</code>
+		<code>get &lt;name&gt; headlines [separator]</code>
 		<br/><br/>
-		<ul>Returns a string, containing all alert headlines separated by |</ul>
+		<ul>Returns a string, containing all alert headlines. <br/>
+		    Default separator is | but can be overriden.</ul>
 		<br/>
 
 		<code>get &lt;name&gt; help</code>