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

[geodb] geodb_builder using new trie_get/set_data_at_index methds

Browse Source
This commit is contained in:
Al
2015-07-20 16:53:48 -04:00
parent 9374745140
commit 9360ff2c4b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/geodb_builder.c
View File

@@ -359,7 +359,7 @@ uint16_t get_address_component(uint32_t boundary_type) {
} }
} }
bool geodb_builder_add_to_trie(geodb_builder_t *self, char *key, uint16_t address_component) { bool geodb_builder_add_to_trie(geodb_builder_t *self, char *key, uint16_t address_components) {
if (self == NULL || self->trie == NULL) return false; if (self == NULL || self->trie == NULL) return false;
uint32_t node_id = trie_get(self->trie, key); uint32_t node_id = trie_get(self->trie, key);
@@ -367,19 +367,20 @@ bool geodb_builder_add_to_trie(geodb_builder_t *self, char *key, uint16_t addres
value.value = 0; value.value = 0;
if (node_id == NULL_NODE_ID) { if (node_id == NULL_NODE_ID) {
value.components |= address_component; value.components |= address_components;
value.count = 1; value.count = 1;
trie_add(self->trie, key, value.value); return trie_add(self->trie, key, value.value);
} else { } else {
trie_node_t node = trie_get_node(self->trie, node_id); if (!trie_get_data_at_index(self->trie, node_id, &value.value)) {
trie_data_node_t data_node = trie_get_data_node(self->trie, node); return false;
value.value = data_node.data; }
value.components |= address_component;
value.components |= address_components;
value.count++; value.count++;
data_node.data = value.value; return trie_set_data_at_index(self->trie, node_id, value.value);
trie_set_data_node(self->trie, -1 * node.base, data_node);
} }
} }