tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Expansions when passing in the address_components= option. Was only limiting results at the phrase level, should work at the individual expansion level

Browse Source
This commit is contained in:
Al
2016-03-29 16:46:29 -04:00
parent 2795d258d1
commit 14e8f50cf1
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libpostal.c
View File

@@ -280,6 +280,8 @@ static string_tree_t *add_string_alternatives(char *str, normalize_options_t opt
token_t token; token_t token;
size_t added_expansions = 0;
if ((value.components & options.address_components) > 0) { if ((value.components & options.address_components) > 0) {
key->n = namespace_len; key->n = namespace_len;
for (int j = phrase.start; j < phrase.start + phrase.len; j++) { for (int j = phrase.start; j < phrase.start + phrase.len; j++) {
@@ -298,8 +300,13 @@ static string_tree_t *add_string_alternatives(char *str, normalize_options_t opt
address_expansion_array *expansions = address_dictionary_get_expansions(key_str); address_expansion_array *expansions = address_dictionary_get_expansions(key_str);
if (expansions != NULL) { if (expansions != NULL) {
for (int j = 0; j < expansions->n; j++) { for (int j = 0; j < expansions->n; j++) {
address_expansion_t expansion = expansions->a[j]; address_expansion_t expansion = expansions->a[j];
if ((expansion.address_components & options.address_components) == 0) {
continue;
}
if (expansion.canonical_index != NULL_CANONICAL_INDEX) { if (expansion.canonical_index != NULL_CANONICAL_INDEX) {
char *canonical = address_dictionary_get_canonical(expansion.canonical_index); char *canonical = address_dictionary_get_canonical(expansion.canonical_index);
char *canonical_normalized = normalize_string_utf8(canonical, normalize_string_options); char *canonical_normalized = normalize_string_utf8(canonical, normalize_string_options);
@@ -347,10 +354,15 @@ static string_tree_t *add_string_alternatives(char *str, normalize_options_t opt
} }
cstring_array_terminate(tree->strings); cstring_array_terminate(tree->strings);
} }
added_expansions++;
} }
} }
} else { }
if (added_expansions == 0) {
uint32_t start_index = cstring_array_start_token(tree->strings); uint32_t start_index = cstring_array_start_token(tree->strings);
for (int j = phrase.start; j < phrase.start + phrase.len; j++) { for (int j = phrase.start; j < phrase.start + phrase.len; j++) {
token = tokens->a[j]; token = tokens->a[j];