services: adapte/update used strings
* for importp module * for export module Signed-off-by: Ralf Zerres <ralf.zerres@networkx.de>
This commit is contained in:
@@ -24,7 +24,7 @@ pub fn export(p: &mut String, lang: &String) -> Result<(), Box<dyn Error>> {
|
|||||||
|
|
||||||
let mut res = t!("csv.export.started", lang);
|
let mut res = t!("csv.export.started", lang);
|
||||||
let mut state = t!("state.started", lang);
|
let mut state = t!("state.started", lang);
|
||||||
trace!(target: "advotrackerd", process = ?res, state = ?state);
|
trace!(target: "csv-export", process = ?res, state = ?state);
|
||||||
|
|
||||||
// Note: slash syntax also works on Windows!
|
// Note: slash syntax also works on Windows!
|
||||||
let path = Path::new(p);
|
let path = Path::new(p);
|
||||||
|
|||||||
@@ -34,13 +34,13 @@ pub fn import(p: &mut String, data_list: &mut PolicyDataList,
|
|||||||
let time_start = SystemTime::now();
|
let time_start = SystemTime::now();
|
||||||
let datetime: DateTime<Local> = time_start.into();
|
let datetime: DateTime<Local> = time_start.into();
|
||||||
|
|
||||||
trace!(target: "advotrackerd", process = ?res, state = ?state, date_start = ?datetime.to_string());
|
trace!(target: "csv-import", process = ?res, state = ?state, date_start = ?datetime.to_string());
|
||||||
|
|
||||||
// Note: slash syntax also works on Windows!
|
// Note: slash syntax also works on Windows!
|
||||||
let path = Path::new(p);
|
let path = Path::new(p);
|
||||||
|
|
||||||
// must be a readable file
|
// must be a readable file
|
||||||
trace!(target: "advotrackerd", path = ?path);
|
trace!(target: "csv-import", path = ?path);
|
||||||
assert_eq!(path.is_file(), true);
|
assert_eq!(path.is_file(), true);
|
||||||
|
|
||||||
// only accept files with '.txt' extensions
|
// only accept files with '.txt' extensions
|
||||||
@@ -49,7 +49,7 @@ pub fn import(p: &mut String, data_list: &mut PolicyDataList,
|
|||||||
|
|
||||||
// open the file
|
// open the file
|
||||||
let file = File::open(path)?;
|
let file = File::open(path)?;
|
||||||
trace!(target: "advotrackerd", extension = ?extension, file = ?file);
|
trace!(target: "csv-import", extension = ?extension, file = ?file);
|
||||||
|
|
||||||
// Build the CSV reader
|
// Build the CSV reader
|
||||||
let mut csv_reader = csv::ReaderBuilder::new()
|
let mut csv_reader = csv::ReaderBuilder::new()
|
||||||
@@ -61,7 +61,7 @@ pub fn import(p: &mut String, data_list: &mut PolicyDataList,
|
|||||||
{
|
{
|
||||||
// We nest this call in its own scope because of lifetimes.
|
// We nest this call in its own scope because of lifetimes.
|
||||||
let headers = csv_reader.headers()?;
|
let headers = csv_reader.headers()?;
|
||||||
trace!(target: "advotrackerd", header = ?headers);
|
trace!(target: "csv-import", header = ?headers);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Iterate over each record, deserialize und write to our structures
|
// Iterate over each record, deserialize und write to our structures
|
||||||
@@ -88,12 +88,12 @@ pub fn import(p: &mut String, data_list: &mut PolicyDataList,
|
|||||||
let time_end = SystemTime::now();
|
let time_end = SystemTime::now();
|
||||||
let duration = time_end.duration_since(time_start)
|
let duration = time_end.duration_since(time_start)
|
||||||
.expect("Clock may have gone backwards");
|
.expect("Clock may have gone backwards");
|
||||||
trace!(target: "advotrackerd", record_count = ?count, duration = ?duration);
|
trace!(target: "csv-import", record_count = ?count, duration = ?duration);
|
||||||
|
|
||||||
state = t!("state.finished", lang);
|
state = t!("state.finished", lang);
|
||||||
res = t!("csv.import.finished", lang);
|
res = t!("csv.import.finished", lang);
|
||||||
let datetime: DateTime<Local> = time_end.into();
|
let datetime: DateTime<Local> = time_end.into();
|
||||||
trace!(target: "advotrackerd", process = ?res, state = ?state, date_stop = ?datetime.to_string());
|
trace!(target: "csv-import", process = ?res, state = ?state, date_stop = ?datetime.to_string());
|
||||||
|
|
||||||
Ok((count, duration))
|
Ok((count, duration))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,5 +8,5 @@
|
|||||||
/// advotracker import modules
|
/// advotracker import modules
|
||||||
pub mod imports;
|
pub mod imports;
|
||||||
|
|
||||||
/// advotracker import modules
|
/// advotracker export modules
|
||||||
pub mod exports;
|
pub mod exports;
|
||||||
|
|||||||
Reference in New Issue
Block a user