diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-07-14 21:07:59 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-07-14 21:07:59 +0000 |
| commit | 86b75a8820ccbda481ac49920cffa8cd61c086fb (patch) | |
| tree | e622b3ca7af53c89de9fd2e66870d1ca390f374c | |
| parent | bd8336c6a3872017b47280b36067bf20549d6f53 (diff) | |
| download | navit-86b75a8820ccbda481ac49920cffa8cd61c086fb.tar.gz | |
Fix:core:Add apostrophes (ASCII 39&96) as word separators for address search.|Fixes #507.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5548 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | navit/gui/internal/gui_internal_search.c | 2 | ||||
| -rw-r--r-- | navit/linguistics.c | 2 | ||||
| -rw-r--r-- | navit/linguistics.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c index 4a564ad7c..9a4bed416 100644 --- a/navit/gui/internal/gui_internal_search.c +++ b/navit/gui/internal/gui_internal_search.c @@ -325,7 +325,7 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se } if((p=strstr(exp,folded_query))!=NULL) { p+=strlen(folded_query); - if(!*p||strchr(" -/()",*p)) { + if(!*p||strchr(LINGUISTICS_WORD_SEPARATORS_ASCII,*p)) { dbg(1,"exact matching word found inside string %s\n",exp); wr->datai=512; } diff --git a/navit/linguistics.c b/navit/linguistics.c index e60497e29..2483a4890 100644 --- a/navit/linguistics.c +++ b/navit/linguistics.c @@ -449,7 +449,7 @@ linguistics_expand_special(const char *str, int mode) char * linguistics_next_word(char *str) { - int len=strcspn(str, " -/()"); + int len=strcspn(str, LINGUISTICS_WORD_SEPARATORS_ASCII); if (!str[len] || !str[len+1]) return NULL; return str+len+1; diff --git a/navit/linguistics.h b/navit/linguistics.h index 91fcc393e..414cf30fa 100644 --- a/navit/linguistics.h +++ b/navit/linguistics.h @@ -1,6 +1,7 @@ #ifdef __cplusplus extern "C" { #endif +#define LINGUISTICS_WORD_SEPARATORS_ASCII " -/()'`" char *linguistics_expand_special(const char *str, int mode); char *linguistics_next_word(char *str); void linguistics_init(void); |