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
This commit is contained in:
markusbloch 2015-03-31 21:25:13 +00:00
parent 37e3a5bbae
commit f81f4e4630

View File

@ -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))
{