administration refactors

1 files changed, 8 insertions, 9 deletions

diff --git a/src/administration_writer.cpp b/src/administration_writer.cpp
index 618b36e..d19fb51 100644
--- a/src/administration_writer.cpp
+++ b/src/administration_writer.cpp
@@ -80,7 +80,7 @@ static char* administration_writer_copy_template(const char* template_str, int*
 
 static bool administration_writer_entry_exists(char* entry)
 {
-    struct zip_t *zip_read = zip_open(administration_file_path_get(), 0, 'r');  
+    struct zip_t *zip_read = zip_open(administration_get_file_path(), 0, 'r');  
     int result = zip_entry_open(zip_read, entry);
     zip_close(zip_read);
 
@@ -92,8 +92,8 @@ static bool _administration_writer_delete_entry_by_name(char* entry)
     STOPWATCH_START;
     
     bool result = 1;
-    struct zip_t *zip_write = zip_open(administration_file_path_get(), 0, 'a');
-    if (!zip_write) zip_write = zip_open(administration_file_path_get(), 0, 'w');
+    struct zip_t *zip_write = zip_open(administration_get_file_path(), 0, 'a');
+    if (!zip_write) zip_write = zip_open(administration_get_file_path(), 0, 'w');
 
     char* indices[1] = {entry};
     if (zip_entries_delete(zip_write, indices, 1) < 0) result = 0;
@@ -118,8 +118,8 @@ static bool administration_writer_write_to_zip(char* entry_to_replace, char* ori
     bool entry_exists = administration_writer_entry_exists(entry_to_replace);
     if (entry_exists) _administration_writer_delete_entry_by_name(entry_to_replace);
 
-    struct zip_t *zip_write = zip_open(administration_file_path_get(), 0, 'a');
-    if (!zip_write) zip_write = zip_open(administration_file_path_get(), 0, 'w');
+    struct zip_t *zip_write = zip_open(administration_get_file_path(), 0, 'a');
+    if (!zip_write) zip_write = zip_open(administration_get_file_path(), 0, 'w');
 
     zip_entry_open(zip_write, entry_to_replace);
     if (zip_entry_write(zip_write, orig_content, final_length) < 0) result = 0;
@@ -644,10 +644,9 @@ bool administration_writer_save_all_administration_info_blocking()
     int buf_length = 0;
     char* file_content = administration_writer_copy_template(administration_save_template, &buf_length);
     
-    strops_replace(file_content, buf_length,        "{{COMPANY_ID}}", administration_company_info_get().id);
-    strops_replace_int32(file_content, buf_length,  "{{NEXT_ID}}", administration_get()->next_id);
-    strops_replace_int32(file_content, buf_length,  "{{NEXT_SEQUENCE_NUMBER}}", administration_get()->next_sequence_number);
-    strops_replace(file_content, buf_length,        "{{PROGRAM_VERSION}}", administration_get()->program_version);
+    strops_replace_int32(file_content, buf_length,  "{{NEXT_ID}}", administration_get_next_id());
+    strops_replace_int32(file_content, buf_length,  "{{NEXT_SEQUENCE_NUMBER}}", administration_get_next_sequence_number());
+    strops_replace(file_content, buf_length,        "{{PROGRAM_VERSION}}", PROGRAM_VERSION);
 
     //// Write to Disk.
     int final_length = (int)strlen(file_content);