FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

FB_CALLMONITOR: use cache first for reverse search (Forum: #35625)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8335 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2015-03-29 21:21:37 +00:00
parent 7928c3cb8b
commit da64225417
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- change: FB_CALLMONITOR: use cache first for reverse search
- feature: 14_CUL_TCM97001: Add receiving for GT-WT-.. and Rubicson sensors - feature: 14_CUL_TCM97001: Add receiving for GT-WT-.. and Rubicson sensors
- feature: 73_km200: Sounding changed from static list to automatic - feature: 73_km200: Sounding changed from static list to automatic
- feature: FHEMWEB: filter dialog for eventMonitor allows filtering for - feature: FHEMWEB: filter dialog for eventMonitor allows filtering for

20
fhem/FHEM/72_FB_CALLMONITOR.pm
View File

@ -480,16 +480,6 @@ FB_CALLMONITOR_reverseSearch($$)
chomp $number; chomp $number;
# Using internal phonebook if available and enabled
if((grep { /^(all|phonebook|internal)$/ } @attr_list) and defined($hash->{helper}{PHONEBOOK}))
{
if(defined($hash->{helper}{PHONEBOOK}{$number}))
{
Log3 $name, 4, "FB_CALLMONITOR ($name) - using internal phonebook for reverse search of $number";
return $hash->{helper}{PHONEBOOK}{$number};
}
}
# Using Cache if enabled # Using Cache if enabled
if(AttrVal($name, "reverse-search-cache", "0") eq "1") if(AttrVal($name, "reverse-search-cache", "0") eq "1")
{ {
@ -503,6 +493,16 @@ FB_CALLMONITOR_reverseSearch($$)
} }
} }
# Using internal phonebook if available and enabled
if((grep { /^(all|phonebook|internal)$/ } @attr_list) and defined($hash->{helper}{PHONEBOOK}))
{
if(defined($hash->{helper}{PHONEBOOK}{$number}))
{
Log3 $name, 4, "FB_CALLMONITOR ($name) - using internal phonebook for reverse search of $number";
return $hash->{helper}{PHONEBOOK}{$number};
}
}
# Ask klicktel.de # Ask klicktel.de
if((grep { /^(all|klicktel\.de)$/ } @attr_list)) if((grep { /^(all|klicktel\.de)$/ } @attr_list))
{ {