From 6bb92946a77c18440aabe575c046ed04cda0e11b Mon Sep 17 00:00:00 2001 From: borisneubert <> Date: Sun, 20 Apr 2014 09:06:53 +0000 Subject: [PATCH] 02_RSS.pm: enable layout storage in configDB git-svn-id: https://svn.fhem.de/fhem/trunk@5582 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/02_RSS.pm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/02_RSS.pm b/fhem/FHEM/02_RSS.pm index 84af0065c..d92127e41 100644 --- a/fhem/FHEM/02_RSS.pm +++ b/fhem/FHEM/02_RSS.pm @@ -62,15 +62,26 @@ RSS_readLayout($) { my $filename= $hash->{fhem}{filename}; my $name= $hash->{NAME}; - if(open(LAYOUT, $filename)) { - my @layout= ; - $hash->{fhem}{layout}= join("", @layout); - close(LAYOUT); + if($attr{global}{configfile} eq 'configDB') { + my $layout = _cfgDB_Readlayout($filename); + if(!(defined($layout))) { + $hash->{fhem}{layout}= ("text 0.1 0.1 'Layout definition not found in database!'"); + Log 1, "RSS $name: Layout $filename not found in database"; + } else { + $hash->{fhem}{layout} = $layout; + } } else { - $hash->{fhem}{layout}= (); - Log 1, "RSS $name: Cannot open $filename"; + if(open(LAYOUT, $filename)) { + my @layout= ; + $hash->{fhem}{layout}= join("", @layout); + close(LAYOUT); + } else { + $hash->{fhem}{layout}= (); + Log 1, "RSS $name: Cannot open $filename"; + } } -} +} + ################## sub