From e95fb73f3fcfb83e4fc94766b549480ef2fa9bc0 Mon Sep 17 00:00:00 2001
From: betateilchen <>
Date: Wed, 2 Aug 2017 17:37:28 +0000
Subject: [PATCH] 98_fheminfo.pm: minor code improvements

git-svn-id: https://svn.fhem.de/fhem/trunk@14839 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/98_fheminfo.pm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/98_fheminfo.pm b/fhem/FHEM/98_fheminfo.pm
index 5f4d2742d..acc0c5263 100644
--- a/fhem/FHEM/98_fheminfo.pm
+++ b/fhem/FHEM/98_fheminfo.pm
@@ -29,7 +29,8 @@ my $c_noModel = 'noModel';
 
 my %fhemInfo    = ();
 my @ignoreList  = qw(Global);
-my @noModelList = qw(knx dummy at archetype weather pushover twilight hminfo readingsgroup);
+my @noModelList = qw(readingsgroup doif lacrosse zwdongle wol weekdaytimer 
+   cul_rfr solarview lw12 tscul knx dummy at archetype weather pushover twilight hminfo readingsgroup);
 
 sub fheminfo_Initialize($$) {
   my %hash = (
@@ -94,8 +95,10 @@ sub _fi2_Count() {
       my $model = $c_noModel;
 
 # 2. look for model information in internals
-      $model = defined($defs{$key}{model}) ? $defs{$key}{model} : $model;
-      $model = defined($defs{$key}{MODEL}) ? $defs{$key}{MODEL} : $model;
+      unless (lc($type) eq 'knx') {
+         $model = defined($defs{$key}{model}) ? $defs{$key}{model} : $model;
+         $model = defined($defs{$key}{MODEL}) ? $defs{$key}{MODEL} : $model;
+      }
 
 # 3. look for model information in attributes
       $model = AttrVal($name,'model',$model);
@@ -120,7 +123,7 @@ sub _fi2_Count() {
       }
       
 # 6. check if model is a scalar
-      $model = $c_noModel if (ref $model);
+      $model = $c_noModel if (ref($model) eq 'HASH');
 
 # 7. skip for some special cases found in database
       next if ( ($model =~ /^unkno.*/i) ||