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

[fix] in root expansions, if the current phrase has at least one valid expansion, and the current expansion is not valid, ignore it

Browse Source
This commit is contained in:
Al
2018-02-06 02:30:03 -05:00
parent 8b96173a32
commit 3a5c048419
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/expand.c
View File

@@ -1005,6 +1005,8 @@ string_tree_t *add_string_alternatives_phrase_option(char *str, libpostal_normal
bool current_phrase_have_canonical = delete_phrases && address_phrase_has_canonical_interpretation(phrase); bool current_phrase_have_canonical = delete_phrases && address_phrase_has_canonical_interpretation(phrase);
bool current_phrase_have_possible_root = delete_phrases && address_phrase_is_possible_root_for_components(phrase, options.address_components); bool current_phrase_have_possible_root = delete_phrases && address_phrase_is_possible_root_for_components(phrase, options.address_components);
bool current_phrase_have_valid = address_phrase_is_valid_for_components(phrase, options.address_components);
log_debug("current_phrase_have_specifier = %d\n", current_phrase_have_specifier); log_debug("current_phrase_have_specifier = %d\n", current_phrase_have_specifier);
bool current_phrase_have_unambiguous = delete_phrases && address_phrase_contains_unambiguous_expansion(phrase); bool current_phrase_have_unambiguous = delete_phrases && address_phrase_contains_unambiguous_expansion(phrase);
@@ -1158,7 +1160,7 @@ string_tree_t *add_string_alternatives_phrase_option(char *str, libpostal_normal
log_debug("current_phrase_ignorable = %d\n", current_phrase_ignorable); log_debug("current_phrase_ignorable = %d\n", current_phrase_ignorable);
} else if (!is_valid_for_components && !is_ambiguous) { } else if (!is_valid_for_components && !is_ambiguous) {
log_debug("!is_valid_for_components\n"); log_debug("!is_valid_for_components\n");
current_phrase_ignorable = current_phrase_have_ignorable; current_phrase_ignorable = current_phrase_have_ignorable || current_phrase_have_valid;
log_debug("current_phrase_ignorable = %d\n", current_phrase_ignorable); log_debug("current_phrase_ignorable = %d\n", current_phrase_ignorable);
} else { } else {
log_debug("none of the above\n"); log_debug("none of the above\n");