summaryrefslogtreecommitdiff
path: root/src/administration_reader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/administration_reader.cpp')
-rw-r--r--src/administration_reader.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/administration_reader.cpp b/src/administration_reader.cpp
index 801941b..5d94eff 100644
--- a/src/administration_reader.cpp
+++ b/src/administration_reader.cpp
@@ -22,7 +22,7 @@
#include <xml.h>
#include <time.h>
-#include "log.hpp"
+#include "logger.hpp"
#include "strops.hpp"
#include "administration_reader.hpp"
#include "administration_writer.hpp"
@@ -90,23 +90,23 @@ bool administration_reader_open_existing(char* file_path)
{
administration_reader_import_administration_info(buffer, (size_t)size);
}
- else if (strops_prefix("T/", name))
+ else if (strops::prefix("T/", name))
{
administration_reader_import_tax_rate(buffer, (size_t)size);
}
- else if (strops_prefix("E/", name))
+ else if (strops::prefix("E/", name))
{
administration_reader_import_cost_center(buffer, (size_t)size);
}
- else if (strops_prefix("P/", name))
+ else if (strops::prefix("P/", name))
{
administration_reader_import_project(buffer, (size_t)size);
}
- else if (strops_prefix("C/", name))
+ else if (strops::prefix("C/", name))
{
administration_reader_import_contact(buffer, (size_t)size);
}
- else if (strops_prefix("I/", name))
+ else if (strops::prefix("I/", name))
{
administration_reader_import_invoice(buffer, (size_t)size);
}
@@ -118,7 +118,7 @@ bool administration_reader_open_existing(char* file_path)
zip_close(zip);
- log_info("Imported '%s' in %.3fms.", file_path, STOPWATCH_TIME);
+ logger::info("Imported '%s' in %.3fms.", file_path, STOPWATCH_TIME);
return true;
}
@@ -163,7 +163,7 @@ bool administration_reader_read_invoice_from_xml(invoice* result, char* buffer,
// Supplier
xml_get_str_x(root, data.supplier.id, MAX_LEN_ID, "cac:AccountingSupplierParty", "cac:Party", "cac:Contact", "cbc:Name", 0);
- strops_copy(data.supplier.bank_account, data.payment_means.payee_bank_account, MAX_LEN_BANK);
+ strops::copy(data.supplier.bank_account, data.payment_means.payee_bank_account, MAX_LEN_BANK);
xml_get_str_x(root, data.supplier.name, MAX_LEN_LONG_DESC, "cac:AccountingSupplierParty", "cac:Party", "cac:PartyName", "cbc:Name", 0);
xml_get_str_x(root, data.supplier.address.address1, MAX_LEN_ADDRESS, "cac:AccountingSupplierParty", "cac:Party", "cac:PostalAddress", "cbc:StreetName", 0);
xml_get_str_x(root, data.supplier.address.address2, MAX_LEN_ADDRESS, "cac:AccountingSupplierParty", "cac:Party", "cac:PostalAddress", "cbc:AdditionalStreetName", 0);
@@ -178,7 +178,7 @@ bool administration_reader_read_invoice_from_xml(invoice* result, char* buffer,
// Customer
xml_get_str_x(root, data.customer.id, MAX_LEN_ID, "cac:AccountingCustomerParty", "cac:Party", "cac:Contact", "cbc:Name", 0);
- strops_copy(data.customer.bank_account, data.payment_means.payer_bank_account, MAX_LEN_BANK);
+ strops::copy(data.customer.bank_account, data.payment_means.payer_bank_account, MAX_LEN_BANK);
xml_get_str_x(root, data.customer.name, MAX_LEN_LONG_DESC, "cac:AccountingCustomerParty", "cac:Party", "cac:PartyName", "cbc:Name", 0);
xml_get_str_x(root, data.customer.address.address1, MAX_LEN_ADDRESS, "cac:AccountingCustomerParty", "cac:Party", "cac:PostalAddress", "cbc:StreetName", 0);
xml_get_str_x(root, data.customer.address.address2, MAX_LEN_ADDRESS, "cac:AccountingCustomerParty", "cac:Party", "cac:PostalAddress", "cbc:AdditionalStreetName", 0);
@@ -236,10 +236,10 @@ bool administration_reader_read_invoice_from_xml(invoice* result, char* buffer,
tax_rate tax_rate;
if (administration_tax_rate_get_by_id(&tax_rate, bi.tax_rate_id) == A_ERR_NOT_FOUND) {
if (administration_tax_rate_get_by_shorthandle(&tax_rate, bi.tax_rate_id) == A_ERR_SUCCESS) {
- strops_copy(bi.tax_rate_id, tax_rate.id, MAX_LEN_ID);
+ strops::copy(bi.tax_rate_id, tax_rate.id, MAX_LEN_ID);
}
else {
- strops_copy(bi.tax_rate_id, "", MAX_LEN_ID);
+ strops::copy(bi.tax_rate_id, "", MAX_LEN_ID);
}
}
@@ -262,11 +262,11 @@ bool administration_reader_import_invoice(char* buffer, size_t buffer_size)
a_err result = administration_invoice_import(&data);
if (result == A_ERR_SUCCESS) {
- log_info("Loaded invoice '%s' in %.3fms.", data.sequential_number, STOPWATCH_TIME);
+ logger::info("Loaded invoice '%s' in %.3fms.", data.sequential_number, STOPWATCH_TIME);
}
else {
- log_aerr(result);
- log_error("ERROR loading invoice '%s'.", data.sequential_number);
+ logger::aerr(result);
+ logger::error("ERROR loading invoice '%s'.", data.sequential_number);
}
return result == A_ERR_SUCCESS;
@@ -301,11 +301,11 @@ bool administration_reader_import_contact(char* buffer, size_t buffer_size)
a_err result = administration_contact_import(data);
if (result == A_ERR_SUCCESS) {
- log_info("Loaded contact '%s' in %.3fms.", data.name, STOPWATCH_TIME);
+ logger::info("Loaded contact '%s' in %.3fms.", data.name, STOPWATCH_TIME);
}
else {
- log_aerr(result);
- log_error("ERROR loading contact '%s'.", data.name);
+ logger::aerr(result);
+ logger::error("ERROR loading contact '%s'.", data.name);
}
return result;
@@ -329,12 +329,12 @@ bool administration_reader_import_project(char* buffer, size_t buffer_size)
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",
+ logger::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);
+ logger::aerr(result);
+ logger::error("ERROR loading project '%s'.", data.id);
}
return result;
@@ -356,12 +356,12 @@ bool administration_reader_import_cost_center(char* buffer, size_t buffer_size)
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",
+ logger::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);
+ logger::aerr(result);
+ logger::error("ERROR loading cost center '%s'.", data.id);
}
return result;
@@ -384,12 +384,12 @@ bool administration_reader_import_tax_rate(char* buffer, size_t buffer_size)
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",
+ logger::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);
+ logger::aerr(result);
+ logger::error("ERROR loading tax rate '%s'.", data.id);
}
return result;
@@ -412,7 +412,7 @@ bool administration_reader_import_administration_info(char* buffer, size_t buffe
xml_get_str_x(root, ai_service.api_key_public, MAX_LEN_API_KEY, "AIService", "PublicKey", 0);
administration_set_ai_service(ai_service);
- log_info("Loaded administration info in %.3fms. next_id=%d next_sequence_number=%d",
+ logger::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;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-12-06 10:46:29 +0000