From 962bdb936a9291a8518059c41ac60c57de03db36 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 29 Sep 2012 16:16:50 +0200 Subject: [PATCH] align papertrail format --- include/config.h | 1 + src/kasse.c | 11 +++++++---- src/print.c | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/config.h b/include/config.h index 74d143a..dfba87e 100644 --- a/include/config.h +++ b/include/config.h @@ -25,6 +25,7 @@ struct status_t { struct status_array_t { BYTE num_items; + unsigned int transaction_id; struct status_t status[MAX_ITEMS]; }; diff --git a/src/kasse.c b/src/kasse.c index 865890a..f9b33dc 100644 --- a/src/kasse.c +++ b/src/kasse.c @@ -67,7 +67,10 @@ Eingenommen: %s, Verkauft: %ld Dinge, Drucken: %s\r\n", f) Freitext verkaufen q) Beenden\r\n"); } -/* Prints a line and logs it to file */ +/* + * Prints a line and logs it to file. Every line can be at max 80 characters. + * + */ static void print_log(char *name, int item_price, int einheiten, char *nickname, char *rest) { char *time = get_time(); char price[10]; @@ -75,7 +78,7 @@ static void print_log(char *name, int item_price, int einheiten, char *nickname, Transaction-ID (Anzahl verkaufter Einträge, inklusive des zu druckenden!) -- 6-stellig Uhrzeit -- 8-stellig Eintragname (= Getränk) -- 9-stellig - Preis (in Cents) -- 7-stellig + Preis (in Cents) -- 9-stellig Anzahl -- 2-stellig Nickname (falls es vom Guthaben abgezogen wird) -- 10-stellig restguthaben (9-stellig) @@ -88,8 +91,8 @@ static void print_log(char *name, int item_price, int einheiten, char *nickname, exit(1); } - sprintf(print_buffer, "%c[%3lu] %s - %-" xstr(MAX_ITEM_NAME_LENGTH) "s - %s - r %s - %d - an %s\r", 17, - items_sold, time, name, price, rest, + sprintf(print_buffer, "%c[%3lu] %s - %-" xstr(MAX_ITEM_NAME_LENGTH) "s - %s - %s - %d - an %s\r", 17, + status.transaction_id, time, name, price, rest, einheiten, (*nickname != '\0' ? nickname : "Unbekannt")); print_the_buffer(); } diff --git a/src/print.c b/src/print.c index 006967b..3f3634c 100644 --- a/src/print.c +++ b/src/print.c @@ -42,13 +42,13 @@ RETRY: } void print_header() { - sprintf(print_buffer, "%c-----------------------------------------------------------------\r", 17); + sprintf(print_buffer, "%c--------------------------------------------------------------------------------\r", 17); print_the_buffer(); - sprintf(print_buffer, "%c#kauf Uhrzeit - Ding - Preis - Restguthab - # - Nickname\r", 17); + sprintf(print_buffer, "%c#kauf Uhrzeit - Ding - Preis - Restguthaben - # - Nickname\r", 17); print_the_buffer(); - sprintf(print_buffer, "%c-----------------------------------------------------------------\r", 17); + sprintf(print_buffer, "%c--------------------------------------------------------------------------------\r", 17); print_the_buffer(); } -- 2.39.5