From 3ae0174d4729528a2c7138aedad555e45c0a7c5b Mon Sep 17 00:00:00 2001
From: markusbloch <>
Date: Sat, 23 Apr 2016 15:16:10 +0000
Subject: [PATCH] FB_CALLLIST: delete also corresponding readings if a call
 gets deleted (Forum: #52158)

git-svn-id: https://svn.fhem.de/fhem/trunk@11300 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                |  2 ++
 fhem/FHEM/72_FB_CALLLIST.pm | 27 ++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 39801a4af..dd09d8ddb 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,7 @@
 # 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.
+  - change:  FB_CALLLIST: delete also corresponding readings if a call gets
+             deleted
   - feature: 49_SSCam: Attribute "disable" to deactivate the module added
   - bugfix:  14_CUL_TCM97001: Fix battery bits.
              Fix Auriol receive
diff --git a/fhem/FHEM/72_FB_CALLLIST.pm b/fhem/FHEM/72_FB_CALLLIST.pm
index 910305924..785dce952 100755
--- a/fhem/FHEM/72_FB_CALLLIST.pm
+++ b/fhem/FHEM/72_FB_CALLLIST.pm
@@ -316,7 +316,7 @@ sub FB_CALLLIST_Notify($$)
             FB_CALLLIST_cleanupList($hash);
 
             # Inform all FHEMWEB clients
-            FB_CALLLIST_updateFhemWebClients($hash) if(grep(m/^(?:ATTR|DELETEATTR)$/, @{$d->{CHANGED}}));
+            FB_CALLLIST_updateFhemWebClients($hash) if(grep(m/^(?:ATTR|DELETEATTR)/, @{$d->{CHANGED}}));
             
             # save current list state to file/configDB
             FB_CALLLIST_saveList($hash);
@@ -741,7 +741,6 @@ sub FB_CALLLIST_list2html($;$)
     $ret .= '<div class="fhemWidget" informId="'.$name.'" cmd="" arg="fbcalllist" dev="'.$name.'">'; # div tag to support inform updates
     $ret .= '<table class="block fbcalllist">';
     
-    
     $ret .= FB_CALLLIST_returnOrderedHTMLOutput($hash, FB_CALLLIST_returnTableHeader($hash), 'class="fbcalllist header"','') if(AttrVal($name, "no-table-header", "0") eq "0");
     
     if(exists($hash->{helper}{DATA}) and (scalar keys %{$hash->{helper}{DATA}}) > 0)
@@ -761,7 +760,9 @@ sub FB_CALLLIST_list2html($;$)
         {
             @list = grep { !$hash->{helper}{DATA}{$_}{running_call} } @list;
         }
-
+        
+        readingsBeginUpdate($hash) if($to_json and $create_readings eq "1");
+        
         foreach my $index (@list)
         {
             $count++;
@@ -797,7 +798,22 @@ sub FB_CALLLIST_list2html($;$)
             $ret .= FB_CALLLIST_returnOrderedHTMLOutput($hash, $line, 'number="'.$count.'" class="fbcalllist '.($count % 2 == 1 ? "odd" : "even").'"', 'class="fbcalllist" '.$td_style);
         }
         
-        readingsSingleUpdate($hash, "numberOfCalls", $count, 1) if($to_json and $create_readings eq "1");
+        if($to_json and $create_readings eq "1")
+        {
+            readingsBulkUpdate($hash, "numberOfCalls", $count, 1);
+            
+            my @delete_readings;
+            
+            for my $reading (grep { /^(\d+)-/ and ($1 > $count) } keys %{$hash->{READINGS}})
+            {
+                readingsBulkUpdate($hash, $reading, "");
+                push @delete_readings, $reading;
+            }
+            
+            readingsEndUpdate($hash, 1) if($to_json and $create_readings eq "1");
+            
+            map { delete($hash->{READINGS}{$_}) } @delete_readings;
+        }
     }
     else
     {
@@ -1017,14 +1033,11 @@ sub FB_CALLLIST_updateReadings($$)
       
     $line_tmp{state} = FB_CALLLIST_returnCallState($hash, $line->{index}, 0);
     
-    readingsBeginUpdate($hash);
     
     foreach my $col (@order)
     {
             readingsBulkUpdate($hash, $line_tmp{line}."-$col", $line_tmp{$col});
     }
-    
-    readingsEndUpdate($hash, 1);
 }
 
 #####################################