credit_manager: fix filter function

[c128-kasse] / src / credit_manager.c

diff --git a/src/credit_manager.c b/src/credit_manager.c
index 6654324e1bdd644a51d95b2bc598abd717ffe99f..97817c0f7a723a07f4f86b92ff2f280c19002b64 100644 (file)
--- a/src/credit_manager.c
+++ b/src/credit_manager.c
@@ -22,6 +22,17 @@ static BYTE filter_len;
 
 static BYTE current_credits_page = 0;
 
+static void print_entry(BYTE i, const char *nickname, unsigned int credit) {
+  char buffer[EUR_FORMAT_MINLEN + 1];
+
+  if (format_euro(buffer, sizeof(buffer), credit) != buffer) {
+    cprintf("Error: Could not format credit %d\r\n", credit);
+    exit(1);
+  }
+
+  cprintf("%d: %s: %s\r\n", i, nickname, buffer);
+}
+
 static void credit_print_screen(void) {
   BYTE i, pages;
   char buffer[EUR_FORMAT_MINLEN + 1];
@@ -33,32 +44,41 @@ static void credit_print_screen(void) {
     current_credits_page = pages;
   cprintf("Datei: CREDITS (Seite %d von %d)\r\n\r\n", current_credits_page,
           pages);
-  for (i = (current_credits_page * CREDITS_PER_PAGE);
-       i < credits.num_items &&
-       i < ((current_credits_page + 1) * CREDITS_PER_PAGE);
-       i++) {
-    if (filter == NULL ||
-        strncmp(credits.credits[i].nickname, filter, filter_len) == 0) {
-      if (format_euro(buffer, sizeof(buffer), credits.credits[i].credit) !=
-          buffer) {
-        cprintf("Error: Could not format credit %d\r\n",
-                credits.credits[i].credit);
-        exit(1);
+  if (filter != NULL) {
+    for (i = 0; i < credits.num_items; i++) {
+      if (strncasecmp(credits.credits[i].nickname, filter, filter_len) != 0) {
+        continue;
       }
-
-      cprintf("%d: %s: %s\r\n", i, credits.credits[i].nickname, buffer);
+      print_entry(i, credits.credits[i].nickname, credits.credits[i].credit);
+    }
+  } else {
+    for (i = (current_credits_page * CREDITS_PER_PAGE);
+         i < credits.num_items &&
+         i < ((current_credits_page + 1) * CREDITS_PER_PAGE);
+         i++) {
+      print_entry(i, credits.credits[i].nickname, credits.credits[i].credit);
     }
   }
   cprintf("\r\nn) Neu d) L" oUML "schen p) Einzahlen b) Seite hoch "
-          "f) Seite runter\r\ng) Filtern e) " AUML "ndern s) Speichern "
-          "z) Zur" uUML "ck\r\n");
+          "f) Seite runter\r\ng) Filtern s) Speichern z) Zur" uUML "ck\r\n");
+}
+
+static int8_t find_credit_idx(char *name) {
+  int8_t i;
+  for (i = 0; i < credits.num_items; ++i) {
+    if (strncasecmp(name, credits.credits[i].nickname, NICKNAME_MAX_LEN + 1) ==
+        0) {
+      return i;
+    }
+  }
+  return -1;
 }
 
 struct credits_t *find_credit(char *name) {
   int i;
-  for (i = 0; i < credits.num_items; i++)
-    if (strncmp(name, credits.credits[i].nickname, NICKNAME_MAX_LEN + 1) == 0)
-      return &credits.credits[i];
+  if ((i = find_credit_idx(name)) >= 0) {
+    return &credits.credits[i];
+  }
   return NULL;
 }
 
@@ -71,7 +91,7 @@ void deposit_credit(char *nickname) {
     return; // cannot find named credit
 
   cprintf("\r\nEinzahlung in Cent:\r\n");
-  if (cget_number(0) == 0)
+  if ((deposit = cget_number(0)) == 0)
     return;
 
   credit->credit += deposit;
@@ -98,6 +118,12 @@ static void new_credit(void) {
   if (cgetn_input(name, sizeof(name)) == 0)
     return;
 
+  if (find_credit_idx(name) >= 0) {
+    cprintf("\rNickname existiert bereits, dr" uUML "cke RETURN...\r\n");
+    cget_return();
+    return;
+  }
+
   cprintf("\r\nGuthaben in Cents:\r\n");
   if ((credit = cget_number(0)) == 0)
     return;
@@ -112,31 +138,20 @@ static void new_credit(void) {
   credits.num_items++;
 }
 
-static void _delete_credit(BYTE num) {
-  memset(credits.credits[num].nickname, '\0', NICKNAME_MAX_LEN + 1);
-  credits.credits[num].credit = 0;
-}
-
-static void delete_credit(void) {
-  char *input;
-  BYTE num, last;
-
-  cprintf("\r Welcher Eintrag soll gel" oUML "scht werden?\r\n");
-  if ((input = get_input()) == NULL || *input == '\0')
+static void delete_credit(char *nickname) {
+  int8_t i;
+  if ((i = find_credit_idx(nickname)) < 0) {
+    cprintf("\r Nick existiert nicht\r\n");
     return;
-  num = atoi(input);
-  if (credits.num_items > 1) {
-    /* Swap last item with this one and delete the last one to avoid holes */
-    last = (credits.num_items - 1);
-    strncpy(credits.credits[num].nickname, credits.credits[last].nickname,
-            NICKNAME_MAX_LEN);
-    credits.credits[num].credit = credits.credits[last].credit;
-    _delete_credit(last);
-  } else {
-    /* Just delete it */
-    _delete_credit(num);
   }
-  credits.num_items--;
+  --credits.num_items;
+  if (i != credits.num_items) {
+    credits.credits[i] = credits.credits[credits.num_items];
+  }
+  memset(credits.credits[credits.num_items].nickname, '\0',
+         NICKNAME_MAX_LEN + 1);
+  credits.credits[credits.num_items].credit = 0;
+  return;
 }
 
 void credit_manager() {
@@ -150,7 +165,10 @@ void credit_manager() {
       new_credit();
       break;
     case 'd':
-      delete_credit();
+      cputs("\rName?\r\n");
+      if (cget_nickname(nickname, sizeof(nickname))) {
+        delete_credit(nickname);
+      }
       break;
     case 's':
       save_credits();
@@ -165,8 +183,9 @@ void credit_manager() {
       break;
     case 'p':
       cputs("\rName?\r\n");
-      if (cgetn_input(nickname, sizeof(nickname)))
+      if (cget_nickname(nickname, sizeof(nickname))) {
         deposit_credit(nickname);
+      }
       break;
     case 'g':
       cprintf("Filter eingeben:\r\n");