diff options
| author | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-03 21:21:49 +0000 |
|---|---|---|
| committer | mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-05-03 21:21:49 +0000 |
| commit | a2fc50574d1c5c850570a636a89d11a66dc3367d (patch) | |
| tree | dcbcb1ac266f0aaca1156459fe69aee55cfe6a87 /navit/country.c | |
| parent | cc2307942ad281717ed09f61e79a36271d6388e1 (diff) | |
| download | navit-a2fc50574d1c5c850570a636a89d11a66dc3367d.tar.gz | |
Fix:core:Make country search accent insensitive. Fixes #1092.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5470 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/country.c')
| -rw-r--r-- | navit/country.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/navit/country.c b/navit/country.c index 5375a22e6..0618b7eb4 100644 --- a/navit/country.c +++ b/navit/country.c @@ -25,6 +25,7 @@ #include "item.h" #include "country.h" #include "search.h" +#include "linguistics.h" #include "navit_nls.h" struct country { @@ -359,8 +360,9 @@ country_search_new(struct attr *search, int partial) { struct country_search *ret=g_new(struct country_search, 1); ret->search=*search; + ret->search.u.str=linguistics_casefold(ret->search.u.str); if (search->type != attr_country_id) - ret->len=strlen(search->u.str); + ret->len=strlen(ret->search.u.str); else ret->len=0; ret->partial=partial; @@ -383,10 +385,7 @@ match(struct country_search *this_, enum attr_type type, const char *name) return 0; if (this_->search.type != type && this_->search.type != attr_country_all) return 0; - if (this_->partial) - ret=(g_strncasecmp(this_->search.u.str, name, this_->len) == 0); - else - ret=(g_strcasecmp(this_->search.u.str, name) == 0); + ret=linguistics_compare(name, this_->search.u.str, linguistics_cmp_expand | (this_->partial?linguistics_cmp_partial:0) | linguistics_cmp_words)==0; return ret; } @@ -431,5 +430,6 @@ country_default(void) void country_search_destroy(struct country_search *this_) { + g_free(this_->search.u.str); g_free(this_); } |