From f81f4e463072e844bc4b98f02e32a432bd0ddf36 Mon Sep 17 00:00:00 2001
From: markusbloch <>
Date: Tue, 31 Mar 2015 21:25:13 +0000
Subject: [PATCH] FB_CALLMONITOR: only give non-unknown cache entries before
 phonebook entries (Forum: #35697)

git-svn-id: https://svn.fhem.de/fhem/trunk@8341 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/72_FB_CALLMONITOR.pm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm
index c885b6dbf..02be96f92 100755
--- a/fhem/FHEM/72_FB_CALLMONITOR.pm
+++ b/fhem/FHEM/72_FB_CALLMONITOR.pm
@@ -481,15 +481,13 @@ FB_CALLMONITOR_reverseSearch($$)
     chomp $number;
 
     # Using Cache if enabled
-    if(AttrVal($name, "reverse-search-cache", "0") eq "1")
+
+    if(AttrVal($name, "reverse-search-cache", "0") eq "1" and defined($hash->{helper}{CACHE}{$number}))
     {
-        if(defined($hash->{helper}{CACHE}{$number}))
+        Log3 $name, 4, "FB_CALLMONITOR ($name) - using cache for reverse search of $number";
+        if($hash->{helper}{CACHE}{$number} ne "timeout" or $hash->{helper}{CACHE}{$number} ne "unknown")
         {
-            Log3 $name, 4, "FB_CALLMONITOR ($name) - using cache for reverse search of $number";
-            if($hash->{helper}{CACHE}{$number} ne "timeout")
-            {
-                return $hash->{helper}{CACHE}{$number};
-            }
+            return $hash->{helper}{CACHE}{$number};
         }
     }
     
@@ -503,6 +501,13 @@ FB_CALLMONITOR_reverseSearch($$)
         }
     }
 
+    # Using Cache if enabled
+    if(AttrVal($name, "reverse-search-cache", "0") eq "1" and defined($hash->{helper}{CACHE}{$number}))
+    {
+        return $hash->{helper}{CACHE}{$number} if($hash->{helper}{CACHE}{$number} ne "timeout");
+    }
+
+    
     # Ask klicktel.de
     if((grep { /^(all|klicktel\.de)$/ } @attr_list))
     {