use cbm_load/cbm_save; WARNING: this code _IS_ broken at the moment

git-svn-id: https://shell.noname-ev.de/svn/kasse/c128@46 af93e077-1a23-4f1e-9cbe-9382a9d578f5

diff --git a/config.c b/config.c
index de2f4f302547faf1b964c8df15b44472b5863f79..d85d5fca74e4959d53013e8075466393c25109e2 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2,6 +2,7 @@
 #include <conio.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdbool.h>
 #include "general.h"
 #include "config.h"
 
@@ -12,100 +13,53 @@ unsigned long int items_sold = 0;
 BYTE printer_port = 4;
 struct status_t status[MAX_ITEMS+1];
 struct credits_t credits[MAX_CREDIT_ITEMS+1];
+static bool files_existing = false;
 
-void load_config();
-
-void load_items() {
-       char line[80];
-       char *sep, *newl = NULL, *lp;
+bool lookup_needed_files() {
        BYTE lfn = 8;
-       BYTE rc;
-       int count = 1;
+       BYTE files_existing = 0;
+       struct cbm_dirent *dirent;
 
-       if ((rc = cbm_open(lfn, (BYTE)8, (BYTE)0, "items,r")) != 0) {
-               cprintf("cannot open items\r\n");
-               return;
-       }
-       for (num_items = 0; num_items < MAX_ITEMS && count > 0;) {
-               count = cbm_read(lfn, line, 79);
-               if (count < 0) {
-                       cprintf("read error\r\n");
-                       return;
-               }
-               line[count] = '\0';
-               lp = line;
-               do {
-                       if (newl)
-                               if (newl < ((line+count)-1))
-                                       lp = newl+1;
-                               else break;
-                       sep = strchr(lp, '=');
-                       strncpy(status[num_items].item_name, lp, sep-lp);
-                       if (newl)
-                               *newl = '\0';
-                       status[num_items].price = atoi(sep+1);
-                       status[num_items].times_sold = 0; 
-                       num_items++;
-               } while (newl = strchr(lp, '\n'));
+       if (cbm_opendir(lfn, (BYTE)8) != 0) {
+               cprintf("could not open directory\r\n");
+               return false;
        }
-       cbm_close(lfn);
+       while (cbm_readdir(lfn, dirent) == 0)
+               if (    strcasecmp(dirent->name, "items") == 0 ||
+                       strcasecmp(dirent->name, "credits") == 0)
+                       files_existing++;
+       cbm_closedir(lfn);
+       return (files_existing == 2);
 }
 
-/**
- * must be called after load_items()
- */
-void load_state(){
-    char line[80];
-    char * sep;
-    char i;
-       BYTE lfn=8;
+void load_items() {
        BYTE rc;
-       int count=1;
+       char *nn;
+       cprintf("load_items()\r\n");
+       if (files_existing) {
+               rc = cbm_load("items", (BYTE)8, status);
+               cprintf("rc = %d\r\n", rc);
+               nn = get_input();
+       }
+//             cbm_load("items", (BYTE)8, NULL);
+}
 
-       rc=cbm_open(lfn, (BYTE)8, (BYTE)0, "state,r");
-    if (rc!=0){
-       cprintf("cannot open state\r\n");
-       return;
-    }
-    while (count>0) {
-       count=cbm_read(lfn,line,79);
-               //fgets(line, 79, f);
-       sep = strchr(line, '=');
-       if (sep==NULL)
-               continue;
-       *(line + (sep-line)) = 0;
-        for (i=0; i< MAX_ITEMS; i++) {
-               if (strcmp(line, status[i].item_name)==0) {
-                       status[i].times_sold = atoi(sep+1);
-                       break;
-               }
-        }
-    }
-    cbm_close(lfn);
+void save_items() {
+       cbm_save("items", (BYTE)8, status, sizeof(struct status_t) * MAX_ITEMS);
+       files_existing = true;
 }
 
-void save_state(){
-       int i;
-       BYTE lfn=8;
-       BYTE rc;
-       int count=1;
-       int size=1;
-       char line[81];
-       
-       rc=cbm_open(lfn, (BYTE)8, (BYTE)0, "state,w");
-    if (rc!=0){
-       c128_perror(23, "cannot open state file");
-       return;
-    }
-    for (i=0;i<num_items;i++)
-       {
-               memset(line,0, 81);
-               size=sprintf(line, "%s=%d\n", status[i].item_name, status[i].times_sold);
-               cbm_write(lfn, line, size);
-       //fprintf(f, "%s=%d\n",status[i].item_name, status[i].times_sold);
-       }
-       cbm_close(lfn);
+void load_credits() {
+       if (files_existing)
+               cbm_load("credits", (BYTE)8, credits);
 }
+
+void save_credits() {
+       cbm_save("credits", (BYTE)8, credits, sizeof(struct credits_t) * MAX_CREDIT_ITEMS);
+       files_existing = true;
+}
+
+
 /*
 void dump_state(){
        FILE * f;
@@ -123,4 +77,5 @@ void dump_state(){
 }
 */
 void load_config() {
+       files_existing = lookup_needed_files();
 }

diff --git a/config.h b/config.h
index 36ca92300c25a1aa5374de27d675dccba2926d4f..0263b9e175ab6e4f18e90c2d879b796eb88fc8d7 100644 (file)
--- a/config.h
+++ b/config.h
@@ -25,7 +25,7 @@ extern struct status_t status[MAX_ITEMS+1];
 
 /* Datenstruktur für die Guthaben */
 struct credits_t {
-       char *nickname;
+       char nickname[11];
        /* Guthaben (in Cent) */
        unsigned int credit;
 };
@@ -36,10 +36,9 @@ extern struct credits_t credits[MAX_CREDIT_ITEMS+1];
 /* Lädt Dinge wie die Druckeradresse */
 void load_config();
 void load_items();
-void load_state();
 void load_credits();
 //void dump_state();
 
-void save_state();
+void save_items();
 void save_credits();
 #endif /*CONFIG_H_*/

diff --git a/credit_manager.c b/credit_manager.c
index eb7e858d257a39809b014b37a3c5225ccf81a19f..f4e7dbeadf9495499be329c7f3b85772fd2fd510 100644 (file)
--- a/credit_manager.c
+++ b/credit_manager.c
@@ -48,7 +48,7 @@ void credit_manager() {
                        }
                        credits_int = atoi(credits_input) * negative;
                        if (credits_int > 0) {
-                               credits[num_credit_items].nickname = nickname;
+                               strcpy(credits[num_credit_items].nickname, nickname);
                                credits[num_credit_items].credit = credits_int;
                                ++num_credit_items;
                        }

diff --git a/general.c b/general.c
index e7f037d6adaec190e4fe69a51f87afea6325f395..bb42e01310f18ba3d19f4641449896a83d0814e4 100644 (file)
--- a/general.c
+++ b/general.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <conio.h>
 
 #include "general.h"
 

diff --git a/kasse.c b/kasse.c
index de72138004db4c78d15e9354fa4180634d125e95..2cd714ceab75fe10939559c4527bfc5c4d9a671e 100644 (file)
--- a/kasse.c
+++ b/kasse.c
@@ -19,19 +19,18 @@ void print_screen() {
        BYTE i = 0;
        char *time = get_time();
        clrscr();
-       cprintf("C128-Kassenprogramm\r\n\r\nUhrzeit: %s (wird nicht aktualisiert\r\nEingenommen: %ld Cents, Verkauft: %ld Flaschen, Drucken: %s\r\n\r\n", time, money, items_sold, (printing == 1 ? "ein" : "aus"));
+       cprintf("C128-Kassenprogramm\r\n\r\nUhrzeit: %s (wird nicht aktualisiert)\r\nEingenommen: %ld Cents, Verkauft: %ld Flaschen, Drucken: %s\r\n\r\n", time, money, items_sold, (printing == 1 ? "ein" : "aus"));
        free(time);
        for (; i < num_items; ++i)
                cprintf("Eintrag %x: %s (%d Cents, %d mal verkauft)\r\n", i, status[i].item_name, status[i].price, status[i].times_sold);
-       cprintf("\r\nBefehle: s) Daten sichern d) Drucken umschalten\r\ng) Guthabenverwaltung z) Zeit setzen\r\n");
+       cprintf("\r\nBefehle: s) Daten sichern d) Drucken umschalten\r\ng) Guthabenverwaltung z) Zeit setzen\r\nn) Neues Getraenk\r\n");
 }
 
 void log_file(char * s) {
-       FILE * f;
-       if (s==NULL)
+       FILE *f;
+       if (s == NULL)
                return;
-       f = fopen("log", "a");
-       if (f==NULL)
+       if ((f = fopen("log", "a")) == NULL)
                c128_perror(23, "kann logfile nicht oeffnen");
        fputs(s, f);
        fclose(f);
@@ -52,13 +51,13 @@ void print_log(BYTE n, int einheiten, char *nickname) {
        c = cbm_open((BYTE)4, (BYTE)4, (BYTE)0, NULL);
        if (c != 0) {
                c128_perror(c, "cbm_open(printer)");
-               save_state();
+               save_items();
                exit(1);
        }
        c = cbm_write((BYTE)4, print_buffer, strlen(print_buffer));
        if (c != strlen(print_buffer)) {
                c128_perror(c, "write(printer)");
-               save_state();
+               save_items();
                exit(1);
        }
        cbm_close((BYTE)4);
@@ -160,12 +159,10 @@ int main() {
        POKE(216, 255);
        /* Konfigurationsdatei laden */
        load_config();
-       /* Einträge (=Getränke) laden */
+       /* Einträge (=Getränke) und Zustand laden */
        load_items();
-       /* Zustand laden */
-       load_state();
        /* Guthaben laden */
-//     load_credits();
+       load_credits();
        while (1) {
                /* Bildschirm anzeigen */
                print_screen();
@@ -176,8 +173,8 @@ int main() {
                        buy(c - 48);
                else if (c == 's') {
                        /* Zustandsdatei schreiben */
-                       save_state();
-//                     save_credits();
+                       save_items();
+                       save_credits();
                        cprintf("Statefile/Creditfile gesichert, druecke ANYKEY...\r\n");
                        getchar();
                } else if (c == 'd') {
@@ -191,6 +188,11 @@ int main() {
                } else if (c == 'z') {
                        /* Zeit setzen */
                        set_time_interactive();
+               } else if (c == 'n') {
+                       strcpy(status[num_items].item_name, "mate");
+                       status[num_items].price = 23;
+                       status[num_items].times_sold = 5;
+                       num_items++;
                } else if (c == 'q')
                        break;
        }