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

[fix] Clearing paths before reuse in geodb_builder

Browse Source
This commit is contained in:
Al
2015-07-26 23:36:34 -04:00
parent 93042761ac
commit 38b10b9dd0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/geodb_builder.c
View File

@@ -394,10 +394,14 @@ bool geodb_finalize(geodb_builder_t *self, char *output_dir) {
trie_save(self->trie, trie_path); trie_save(self->trie, trie_path);
char_array_clear(path);
char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_HASH_FILENAME); char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_HASH_FILENAME);
char *hash_filename = strdup(char_array_get_string(path)); char *hash_filename = strdup(char_array_get_string(path));
char_array_clear(path);
char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_LOG_FILENAME); char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_LOG_FILENAME);
char *log_filename = char_array_get_string(path); char *log_filename = char_array_get_string(path);
@@ -414,6 +418,8 @@ bool geodb_finalize(geodb_builder_t *self, char *output_dir) {
free(hash_filename); free(hash_filename);
char_array_clear(path);
char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_BLOOM_FILTER_FILENAME); char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_BLOOM_FILTER_FILENAME);
char *bloom_filter_path = char_array_get_string(path); char *bloom_filter_path = char_array_get_string(path);
if (!bloom_filter_save(self->bloom_filter, bloom_filter_path)) { if (!bloom_filter_save(self->bloom_filter, bloom_filter_path)) {
@@ -496,6 +502,7 @@ void import_geonames(geodb_builder_t *self, char *filename) {
} }
uint32_array_clear(ordered_ids); uint32_array_clear(ordered_ids);
char_array_clear(ordered_ids_str);
kh_clear(int_set, distinct_ids); kh_clear(int_set, distinct_ids);
kh_clear(str_set, distinct_features); kh_clear(str_set, distinct_features);
@@ -698,9 +705,6 @@ int main(int argc, char **argv) {
output_dir = LIBPOSTAL_GEODB_DIR; output_dir = LIBPOSTAL_GEODB_DIR;
} }
bool strip_input_separator = strncmp(input_dir + strlen(input_dir) - 1, PATH_SEPARATOR, PATH_SEPARATOR_LEN) == 0;
bool strip_output_separator = strncmp(output_dir + strlen(output_dir) - 1, PATH_SEPARATOR, PATH_SEPARATOR_LEN) == 0;
char *geonames_filename = "geonames.tsv"; char *geonames_filename = "geonames.tsv";
char_array *path = char_array_new_size(strlen(input_dir)); char_array *path = char_array_new_size(strlen(input_dir));
@@ -708,6 +712,8 @@ int main(int argc, char **argv) {
char_array_add_joined(path, PATH_SEPARATOR, true, 2, input_dir, geonames_filename); char_array_add_joined(path, PATH_SEPARATOR, true, 2, input_dir, geonames_filename);
char *geonames_path = strdup(char_array_get_string(path)); char *geonames_path = strdup(char_array_get_string(path));
char_array_clear(path);
char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_LOG_FILENAME); char_array_add_joined(path, PATH_SEPARATOR, true, 2, output_dir, GEODB_LOG_FILENAME);
char *log_filename = char_array_get_string(path); char *log_filename = char_array_get_string(path);
@@ -721,6 +727,8 @@ int main(int argc, char **argv) {
char *postal_codes_filename = "postal_codes.tsv"; char *postal_codes_filename = "postal_codes.tsv";
char_array_clear(path);
char_array_add_joined(path, PATH_SEPARATOR, true, 2, input_dir, postal_codes_filename); char_array_add_joined(path, PATH_SEPARATOR, true, 2, input_dir, postal_codes_filename);
char *postal_codes_path = char_array_get_string(path); char *postal_codes_path = char_array_get_string(path);