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

[phrases] Adding _with_phrases versions of address dictionary methods for pre-allocated phrases

Browse Source
This commit is contained in:
Al
2015-09-16 21:24:23 -04:00
parent 23103a21d4
commit e62c75b9c6
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/address_dictionary.c
View File

@@ -159,28 +159,50 @@ static trie_prefix_result_t get_language_prefix(char *lang) {
return prefix; return prefix;
} }
phrase_array *search_address_dictionaries(char *str, char *lang) { bool search_address_dictionaries_with_phrases(char *str, char *lang, phrase_array **phrases) {
if (str == NULL) return NULL; if (str == NULL) return false;
trie_prefix_result_t prefix = get_language_prefix(lang); trie_prefix_result_t prefix = get_language_prefix(lang);
if (prefix.node_id == NULL_NODE_ID) { if (prefix.node_id == NULL_NODE_ID) {
return NULL; return false;
} }
return trie_search_from_index(address_dict->trie, str, prefix.node_id); return trie_search_from_index(address_dict->trie, str, prefix.node_id, phrases);
} }
phrase_array *search_address_dictionaries_tokens(char *str, token_array *tokens, char *lang) { phrase_array *search_address_dictionaries(char *str, char *lang) {
if (str == NULL) return NULL; phrase_array *phrases = NULL;
if (!search_address_dictionaries_with_phrases(str, lang, &phrases)) {
return NULL;
}
return phrases;
}
bool search_address_dictionaries_tokens_with_phrases(char *str, token_array *tokens, char *lang, phrase_array **phrases) {
if (str == NULL) return false;
trie_prefix_result_t prefix = get_language_prefix(lang); trie_prefix_result_t prefix = get_language_prefix(lang);
if (prefix.node_id == NULL_NODE_ID) { if (prefix.node_id == NULL_NODE_ID) {
return false;
}
return trie_search_tokens_from_index(address_dict->trie, str, tokens, prefix.node_id, phrases);
}
phrase_array *search_address_dictionaries_tokens(char *str, token_array *tokens, char *lang) {
phrase_array *phrases = NULL;
if (!search_address_dictionaries_tokens_with_phrases(str, tokens, lang, &phrases)) {
return NULL; return NULL;
} }
return trie_search_tokens_from_index(address_dict->trie, str, tokens, prefix.node_id); return phrases;
} }
phrase_t search_address_dictionaries_prefix(char *str, size_t len, char *lang) { phrase_t search_address_dictionaries_prefix(char *str, size_t len, char *lang) {

2
src/address_dictionary.h
View File

@@ -59,7 +59,9 @@ address_dictionary_t *get_address_dictionary(void);
bool address_dictionary_init(void); bool address_dictionary_init(void);
phrase_array *search_address_dictionaries(char *str, char *lang); phrase_array *search_address_dictionaries(char *str, char *lang);
bool search_address_dictionaries_with_phrases(char *str, char *lang, phrase_array **phrases);
phrase_array *search_address_dictionaries_tokens(char *str, token_array *tokens, char *lang); phrase_array *search_address_dictionaries_tokens(char *str, token_array *tokens, char *lang);
bool search_address_dictionaries_tokens_with_phrases(char *str, token_array *tokens, char *lang, phrase_array **phrases);
phrase_t search_address_dictionaries_prefix(char *str, size_t len, char *lang); phrase_t search_address_dictionaries_prefix(char *str, size_t len, char *lang);
phrase_t search_address_dictionaries_suffix(char *str, size_t len, char *lang); phrase_t search_address_dictionaries_suffix(char *str, size_t len, char *lang);