diff options
Diffstat (limited to 'src/administration_reader.cpp')
| -rw-r--r-- | src/administration_reader.cpp | 62 |
1 files changed, 46 insertions, 16 deletions
diff --git a/src/administration_reader.cpp b/src/administration_reader.cpp index 91f62a9..fb2fbf0 100644 --- a/src/administration_reader.cpp +++ b/src/administration_reader.cpp @@ -118,7 +118,7 @@ bool administration_reader_open_existing(char* file_path) zip_close(zip); - log_add("Imported '%s' in %.3fms.", file_path, STOPWATCH_TIME); + log_info("Imported '%s' in %.3fms.", file_path, STOPWATCH_TIME); return true; } @@ -240,10 +240,16 @@ bool administration_reader_import_invoice(char* buffer, size_t buffer_size) free(child_name); } - bool result = administration_invoice_import(&data); - log_add("Loaded invoice '%s' in %.3fms.", data.sequential_number, STOPWATCH_TIME); + a_err result = administration_invoice_import(&data); + if (result == A_ERR_SUCCESS) { + log_info("Loaded invoice '%s' in %.3fms.", data.sequential_number, STOPWATCH_TIME); + } + else { + log_aerr(result); + log_error("ERROR loading invoice '%s'.", data.sequential_number); + } - return result; + return result == A_ERR_SUCCESS; } bool administration_reader_import_contact(char* buffer, size_t buffer_size) @@ -273,8 +279,14 @@ bool administration_reader_import_contact(char* buffer, size_t buffer_size) xml_get_str(node_address, data.address.postal, MAX_LEN_ADDRESS, "Postal"); xml_get_str(node_address, data.address.region, MAX_LEN_ADDRESS, "Region"); - bool result = administration_contact_import(data); - log_add("Loaded contact '%s' in %.3fms.", data.name, STOPWATCH_TIME); + a_err result = administration_contact_import(data); + if (result == A_ERR_SUCCESS) { + log_info("Loaded contact '%s' in %.3fms.", data.name, STOPWATCH_TIME); + } + else { + log_aerr(result); + log_error("ERROR loading contact '%s'.", data.name); + } return result; } @@ -295,9 +307,15 @@ bool administration_reader_import_project(char* buffer, size_t buffer_size) data.start_date = xml_get_s64(root, "StartDate"); data.end_date = xml_get_s64(root, "EndDate"); - bool result = administration_project_import(data); - log_add("Loaded project in %.3fms. id=%s description=%s state=%d started=%lld end=%lld", - STOPWATCH_TIME, data.id, data.description, data.state, data.start_date, data.end_date); + a_err result = administration_project_import(data); + if (result == A_ERR_SUCCESS) { + log_info("Loaded project in %.3fms. id=%s description=%s state=%d started=%lld end=%lld", + STOPWATCH_TIME, data.id, data.description, data.state, data.start_date, data.end_date); + } + else { + log_aerr(result); + log_error("ERROR loading project '%s'.", data.id); + } return result; } @@ -316,9 +334,15 @@ bool administration_reader_import_cost_center(char* buffer, size_t buffer_size) xml_get_str(root, data.code, MAX_LEN_CODE, "Code"); xml_get_str(root, data.description, MAX_LEN_LONG_DESC, "Description"); - bool result = administration_cost_center_import(data); - log_add("Loaded cost center in %.3fms. id=%s code=%s description=%s", - STOPWATCH_TIME, data.id, data.code, data.description); + a_err result = administration_cost_center_import(data); + if (result == A_ERR_SUCCESS) { + log_info("Loaded cost center in %.3fms. id=%s code=%s description=%s", + STOPWATCH_TIME, data.id, data.code, data.description); + } + else { + log_aerr(result); + log_error("ERROR loading cost center '%s'.", data.id); + } return result; } @@ -338,9 +362,15 @@ bool administration_reader_import_tax_rate(char* buffer, size_t buffer_size) xml_get_str(root, data.category_code, MAX_LEN_CODE, "Category"); data.rate = xml_get_float(root, "Rate"); - bool result = administration_tax_rate_import(data); - log_add("Loaded tax rate info in %.3fms. id=%s country_code=%s category_code=%s rate=%.2f", - STOPWATCH_TIME, data.id, data.country_code, data.category_code, data.rate); + a_err result = administration_tax_rate_import(data); + if (result == A_ERR_SUCCESS) { + log_info("Loaded tax rate info in %.3fms. id=%s country_code=%s category_code=%s rate=%.2f", + STOPWATCH_TIME, data.id, data.country_code, data.category_code, data.rate); + } + else { + log_aerr(result); + log_error("ERROR loading tax rate '%s'.", data.id); + } return result; } @@ -357,7 +387,7 @@ bool administration_reader_import_administration_info(char* buffer, size_t buffe administration_set_next_id(xml_get_s32(root, "NextId")); administration_set_next_sequence_number(xml_get_s32(root, "NextSequenceNumber")); - log_add("Loaded administration info in %.3fms. next_id=%d next_sequence_number=%d", + log_info("Loaded administration info in %.3fms. next_id=%d next_sequence_number=%d", STOPWATCH_TIME, administration_get_next_id(), administration_get_next_sequence_number()); return true; |