X-Git-Url: https://git.infodrom.org/?p=infodrom%2Fdtaus;a=blobdiff_plain;f=dtaus.c;h=69177f841588c66ef67d14b04a4d68f288887087;hp=93e8b3c1f55acf975aad543b75a5decb54b82f79;hb=eab76c4e4acff9dfaa51a1640f9d25b3d5065d6d;hpb=20d6794dd7f0bf5d97905d085c7504608a0a4220 diff --git a/dtaus.c b/dtaus.c index 93e8b3c..69177f8 100644 --- a/dtaus.c +++ b/dtaus.c @@ -1,6 +1,6 @@ /* - dtaus.c - Datenträgeraustausch mit einer Bank - Copyright (c) 1996,8,2001 Martin Schulze + dtaus.c - Belegloser Datenträgeraustausch mit einer Bank + Copyright (c) 1996,8,2001-4 Martin Schulze This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,6 +27,14 @@ #include #include #include +#include "latex.h" + +#define DEFAULT_EURO +#ifndef DEFAULT_EURO +int use_euro = 0; +#else +int use_euro = 1; +#endif /* * First: Some control structures @@ -55,7 +63,10 @@ dtaus_record recA[] = { {"BLZ", 7, 8, REQ}, {"Referenz", 70, 10, OPT}, {"Datum", 50, 6, IGN}, + {"Ausfuehrung", 95, 8, OPT}, + {"Currency", 127, 1, OPT}, {"Euro", 127, 1, OPT}, + {"DM", 127, 1, OPT}, {NULL, 0, 0} }; @@ -65,22 +76,35 @@ dtaus_record recA[] = { #define A_BLZ 3 #define A_REF 4 #define A_DATE 5 -#define A_EURO 6 -#define A_LEN 7 +#define A_TODO 6 +#define A_CURR 7 +#define A_EURO 8 +#define A_DM 9 +#define A_LEN 10 +#define A_LOOP 7 dtaus_record recC[] = { {"Name", 93, 27, REQ}, {"Konto", 21, 10, REQ}, {"BLZ", 13, 8, REQ}, {"Transaktion", 44, 5, REQ}, +#ifndef DEFAULT_EURO {"Betrag", 50, 11, REQ}, +#else + {"Betrag", 79, 11, REQ}, +#endif {"Zweck", 155, 27, REQ}, {"myName", 128, 27, OPT}, {"myKonto", 69, 10, OPT}, {"myBLZ", 61, 8, OPT}, - {"Euro", 182, 1, IGN}, {"Text", 187, 29, OPT}, {"Extension", 216, 29, OPT}, + {"Currency", 182, 1, IGN}, +#ifndef DEFAULT_EURO + {"Betrag-Euro", 79, 11, IGN}, +#else + {"Betrag-DM", 50, 11, IGN}, +#endif {NULL, 0, 0} }; @@ -93,18 +117,33 @@ dtaus_record recC[] = { #define C_MYNAM 6 #define C_MYKTO 7 #define C_MYBLZ 8 -#define C_EURO 9 -#define C_TEXT 10 -#define C_EXT 11 -#define C_LEN 12 +#define C_TEXT 9 +#define C_EXT 10 +#define C_EURO 11 +#ifndef DEFAULT_EURO +#define C_EUR 12 +#else +#define C_DM 12 +#endif +#define C_LEN 13 +#define C_LOOP 11 -#define MAX_TEXT 61 +#define MAX_TEXT 14 dtaus_record recE[] = { {"Anzahl", 10, 7, IGN}, +#ifndef DEFAULT_EURO {"Summe", 17, 13, IGN}, +#else + {"Summe", 64, 13, IGN}, +#endif {"Kontos", 30, 17, IGN}, {"BLZs", 47, 17, IGN}, +#ifndef DEFAULT_EURO + {"Summe-Euro", 64, 13, IGN}, +#else + {"Summe-DM", 17, 13, IGN}, +#endif {NULL, 0, 0} }; @@ -112,7 +151,12 @@ dtaus_record recE[] = { #define E_VAL 1 #define E_KTO 2 #define E_BLZ 3 -#define E_LEN 0 +#ifndef DEFAULT_EURO +#define E_EUR 4 +#else +#define E_DM 4 +#endif +#define E_LEN 5 /* * Second: Some low level routines @@ -120,7 +164,7 @@ dtaus_record recE[] = { size_t dtaus_nextrec (void **buf, FILE *f) { - bzero (buf, 128); + memset (buf, 0, 128); return fread(buf, 128, 1, f); } @@ -206,7 +250,7 @@ char *strip_nondigits (char *s) char dtaus_char (void *buf, unsigned int pos) { static char res; - char *bufp = buf; + char *bufp = (char *)buf; bufp+=pos; memcpy(&res, bufp, 1); @@ -230,15 +274,57 @@ char *real2string(char *s) { static char res[20]; char *cp; + char *xp; /* only to avoid a GCC warning */ - strcpy(res, s); + strncpy(res, s, sizeof(res)-1); + res[sizeof(res)-1] = 0; for (cp=res; *cp&&!(*cp == ',')&&!(*cp == '.');cp++); - *(cp++) = *(cp+1); - *(cp++) = *(cp+1); + + if ((cp-res) >= (sizeof(res)-3)) { + /* Bail out, since the number is too large, shouldn't be possible though. */ + fprintf (stderr, "Value %s too large.\n", res); + exit (1); + } + + if (*cp == '.' || *cp == ',') { + if (*(cp+1)) { + /* 1st decimal place */ + xp = cp+1; + if (*xp && isdigit(*xp)) + *(cp++) = *xp; + else + *(cp++) = '0'; + /* 2nd decimal place */ + xp = cp+1; + if (*xp && isdigit(*xp)) + *(cp++) = *xp; + else + *(cp++) = '0'; + } else { + *(cp++) = '0'; + *(cp++) = '0'; + } + } else { + *(cp++) = '0'; + *(cp++) = '0'; + } *cp = '\0'; return res; } +/* + * Return the last digit of the year as character + */ +char get_date_lastdigit() +{ + time_t timer; + struct tm *loctime; + + timer = time ( NULL ); + loctime = localtime(&timer); + return loctime->tm_year % 10 + '0'; +} + char *string2trans (char *s) { static char res[30]; @@ -257,7 +343,7 @@ char *string2trans (char *s) else if (!strcmp(s, "53000")) sprintf (res, "Lohn"); else if (!strncmp(s, "5400", 4)) - sprintf (res, "Vermögen"); + sprintf (res, "Vermögen %c",s[4]); /* else if (!strcmp(s, "56000")) sprintf (res, ""); / * Überweisung öffentlicher Kassen */ return res; @@ -266,6 +352,7 @@ char *string2trans (char *s) char *trans2string (char *s) { static char res[30]; + char *cp; res[0] = '\0'; if (!strcmp(s, "Abbuchung")) @@ -280,8 +367,34 @@ char *trans2string (char *s) sprintf (res, "51000"); else if (!strcmp(s, "Lohn")) sprintf (res, "53000"); - else if (!strncmp(s, "Vermögen", 4)) - sprintf (res, "5400"); + else { + cp = NULL; + if (!strncmp(s, "Vermögen", 8)) + cp = s+8; + if (!strncmp(s, "Vermoegen", 9)) + cp = s+9; + + if (!cp) { + fprintf (stderr, "Unbekannte Transaktion `%s'\n", res); + exit (1); + } + + /* + Vermögen --> 5400 + Vermögen 8 -> 5400<8> + Vermögen 2003 -> 5400<3> + */ + + if (*cp) while (!isspace(*cp)) cp++; + while (isspace(*cp)) cp++; + + if (!*cp || !isdigit(*cp)) + sprintf (res, "5400%c",get_date_lastdigit()); + else { + while (isdigit(*cp)) cp++; + sprintf (res, "5400%c",*(cp-1)); + } + } /* else if (!strcmp(s, "")) sprintf (res, "56000"); / * Überweisung öffentlicher Kassen */ return res; @@ -318,7 +431,7 @@ char *ext2string (char *s) unsigned long int dtaus_int(void *buf, unsigned int pos, unsigned int len) { char tmp[30]; - char *bufp = buf; + char *bufp = (char *)buf; static unsigned long int res; bufp+=pos; @@ -338,8 +451,8 @@ char *extract_ident (char *line) static char word[30]; if (strlen(line) > 0) { - x = index (line, ' '); - y = index (line, '\t'); + x = strchr (line, ' '); + y = strchr (line, '\t'); if (!x && !y) { strncpy(word, line, 29); @@ -412,8 +525,8 @@ size_t control_nextline (void **buf, int len, FILE *f) char *cp; int i; - bzero (line, sizeof(line)); - bzero (buf, len); + memset (line, 0, sizeof(line)); + memset (buf, 0, len); cp = line; while (!strlen(line) && (cp = fgets(line, 100, f))) { @@ -424,7 +537,7 @@ size_t control_nextline (void **buf, int len, FILE *f) while (tmp[strlen(tmp)-1] != '\n' && (cp = fgets(tmp, 100, f))); } else line[strlen(line)-1] = '\0'; - if (line[strlen(line)-1] == ' ') + if (line[strlen(line)-1] == '\r') line[strlen(line)-1] = '\0'; for (i=strlen(line);(line[i-1] == ' '||line[i-1] == '\t')&&i>0; i--) line[i-1] = '\0'; @@ -443,6 +556,9 @@ size_t control_nextline (void **buf, int len, FILE *f) return 0; } +/* + * Return the current date nicely formatted + */ char *get_date() { static char res[10]; @@ -466,7 +582,7 @@ void dtaus_prepareA (char *buf) struct tm *loctime; char tmp[10]; - bzero (buf, 129); + memset (buf, 0, 129); timer = time ( NULL ); loctime = localtime(&timer); @@ -481,7 +597,10 @@ void dtaus_prepareA (char *buf) for (i=56;i<56+4; i++) buf[i] = ' '; /* A8 */ for (i=70;i<70+10; i++) buf[i] = '0'; /* A10 */ for (i=80;i<80+48; i++) buf[i] = ' '; /* A11 */ - buf[127] = ' '; /* A12 (Currency) */ + if (use_euro) + buf[recA[A_CURR].pos] = '1'; /* A12 (Currency) */ + else + buf[recA[A_CURR].pos] = ' '; /* A12 (Currency) */ } /* @@ -492,24 +611,19 @@ void dtaus_prepareC (char *buf, int normaltext, int maxtext) { int i; int appendix = 0; - div_t res; - bzero (buf, 257); - buf[0] = '0'; + memset (buf, 0, 257); if (normaltext) appendix = 1; - if (maxtext) { - res = div (maxtext-1, 4); - appendix += res.quot; - if (res.rem) appendix++; - } + appendix += maxtext; i = 187 + (appendix * 29); /* Bail out if the number is too large, shouldn't be possible though */ if (i >= 1000) exit (1); + buf[0] = (i/1000)+48;i-=(i/1000)*100; buf[1] = (i/100)+48;i-=(i/100)*100; buf[2] = (i/10)+48;i-=(i/10)*10; buf[3] = i+48; @@ -518,15 +632,20 @@ void dtaus_prepareC (char *buf, int normaltext, int maxtext) for (i=31;i<31+13; i++) buf[i] = '0'; /* C6 */ buf[49] = ' '; /* C8 */ for (i=50;i<50+11; i++) buf[i] = '0'; /* C9 (Betrag) */ - for (i=79;i<79+11; i++) buf[i] = '0'; /* C12 (Euro) */ + for (i=79;i<79+11; i++) buf[i] = '0'; /* C12 (Betrag Euro) */ for (i=90;i<90+3; i++) buf[i] = ' '; /* C13 */ for (i=93;i<90+27; i++) buf[i] = ' '; /* C14a (Kunde) */ for (i=120;i<120+8; i++) buf[i] = ' '; /* C14b */ - buf[182] = ' '; /* C17a (Currency) */ + if (use_euro) + buf[recC[C_EURO].pos] = '1'; /* C17a (Currency) */ + else + buf[recC[C_EURO].pos] = ' '; /* C17a (Currency) */ for (i=183;i<183+2; i++) buf[i] = ' '; /* C17b */ - for (i=185;i<185+2; i++) buf[i] = '0'; /* C18 (#Extension) */ for (i=187;i<187+(29*2); i++) buf[i] = ' '; /* C19-C22 (misc text) */ for (i=245;i<245+11; i++) buf[i] = ' '; /* C23 */ + + buf[185+0] = (appendix/10)+48;appendix-=(appendix/10)*10; + buf[185+1] = appendix+48; } /* @@ -537,7 +656,7 @@ void dtaus_prepareE (char *buf) { int i; - bzero (buf, 129); + memset (buf, 0, 129); buf[0] = '0'; buf[1] = '1'; buf[2] = '2'; @@ -572,12 +691,16 @@ int dtaus_writeA(FILE *f, char **values) dtaus_prepareA(buf); buf[5] = values[A_TRANS][0]; buf[6] = values[A_TRANS][1]; - sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),8)); - for (i=0; i<8; i++) buf[recA[A_BLZ].pos+i] = tmp[i]; - sprintf (tmp, "%-27s", upcase(values[A_NAME])); + sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[A_BLZ]),recA[A_BLZ].len)); + for (i=0; i recC[i].len) - values[i][recC[i].len] = '\0'; + values[i][recC[i].len-2] = '\0'; i=C_ZWECK;if (values[i] && strlen(values[i]) > recC[i].len) values[i][recC[i].len] = '\0'; i=C_MYNAM;if (values[i] && strlen(values[i]) > recC[i].len) values[i][recC[i].len] = '\0'; i=C_TEXT;if (values[i] && strlen(values[i]) > recC[i].len) values[i][recC[i].len] = '\0'; - i=C_EXT;if (values[i] && strlen(values[i]) > recC[i].len) - values[i][recC[i].len] = '\0'; dtaus_prepareC (buf, values[C_TEXT] != NULL, maxtext); for (i=0; i<5; i++) buf[recC[C_TRANS].pos+i] = tmp[i]; @@ -637,41 +757,44 @@ int dtaus_writeC(FILE *f, char **valuesA, char **values, char **text) sprintf (tmp, "%s", padzeroclip (strip_nondigits (values[C_KTO]),10)); for (i=0; i 0) { + res = div (extC, 4); + extC = res.quot; + if (res.rem) extC++; + } } - if (dtaus_nextrec(buf, fdtaus) != 1) - bzero (buf, sizeof(buf)); + if (dtaus_nextrec((void *)buf, fdtaus) != 1) + memset (buf, 0, sizeof(buf)); /* * Are there extension records that we have to check? @@ -852,8 +1062,8 @@ void dtaus2control (char *cdtaus, char *ccontrol) printctln(fcontrol, string2ext(x), strip_spaces(tmp)); } } - if (dtaus_nextrec(buf, fdtaus) != 1) - bzero (buf, sizeof(buf)); + if (dtaus_nextrec((void *)buf, fdtaus) != 1) + memset (buf, 0, sizeof(buf)); extC--; } fprintf(fcontrol, "}\n"); @@ -869,12 +1079,32 @@ void dtaus2control (char *cdtaus, char *ccontrol) fprintf(fcontrol, "\nEND {\n"); for (index=E_COUNT; index <= E_BLZ; index++) { +#ifndef DEFAULT_EURO + if (use_euro && index == E_VAL) + index = E_EUR; +#else + if (!use_euro && index == E_VAL) + index = E_DM; +#endif + bufp = buf + recE[index].pos; memcpy(tmp, bufp, recE[index].len); tmp[recE[index].len] = '\0'; - if (index == E_VAL) - printctln(fcontrol, recE[index].name, strip_zeros(string2real(tmp))); + +#ifndef DEFAULT_EURO + if (index == E_VAL || index == E_EUR) +#else + if (index == E_VAL || index == E_DM) +#endif + printctln(fcontrol, recE[E_VAL].name, strip_zeros(string2real(tmp))); else printctln(fcontrol, recE[index].name, strip_zeros(tmp)); +#ifndef DEFAULT_EURO + if (use_euro && index == E_EUR) + index = E_VAL; +#else + if (!use_euro && index == E_DM) + index = E_VAL; +#endif } fprintf(fcontrol, "}\n"); @@ -890,13 +1120,12 @@ void dtaus2control (char *cdtaus, char *ccontrol) fclose(fdtaus); } -int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) +int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck, char *latex) { FILE *fdtaus, *fcontrol, *fbeleg, *fcheck; void *buf; char *ident; int recindex; - char tmp[30]; char line[100]; char *valA[A_LEN], *valC[C_LEN]; int count; @@ -904,6 +1133,11 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) char **text = NULL; char *cp; int textindex = 0; + int len, i; + char *type = NULL; + char *currency = NULL; + char date_todo[11]; + char ssum_val[30], ssum_kto[30], ssum_blz[30]; if (!cdtaus) { if (!(fdtaus = fopen("dtaus0.txt", "w"))) @@ -946,7 +1180,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) /* * Record A lesen */ - bzero(valA, sizeof(valA)); + memset (valA, 0, sizeof(valA)); control_nextline ((void *)line, 100, fcontrol); ident = extract_ident(line); if (!strcmp(ident, "begin") && (line[0] == '{')) { @@ -954,24 +1188,46 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) while (strlen(line) && line[0] != '}') { ident = extract_ident(line); if ((recindex = rec_index(ident, REC_A)) != -1) + { if (recA[recindex].type != IGN) if ((valA[recindex] = (char *)malloc (strlen(line)+1))) strcpy(valA[recindex], line); + } else { + if (! strcasecmp (ident, "euro")) + use_euro = 1; + if (! strcasecmp (ident, "dm")) + use_euro = 0; + } control_nextline ((void *)line, 100, fcontrol); } if (((recindex = rec_index("art", REC_A)) != -1) && valA[recindex] && strlen(valA[recindex])) { - fprintf(fbeleg, "\n\n"); - fprintf(fbeleg, "\n Begleitzettel\n\n"); - fprintf(fbeleg, "\n Belegloser Datentraegeraustausch\n\n"); if (valA[recindex][0] == 'L') - fprintf(fbeleg, "\n Sammeleinziehungsauftrag\n\n"); + type = strdup ("Sammeleinziehungsauftrag"); else if (valA[recindex][0] == 'G') - fprintf(fbeleg, "\n Sammelueberweisungsauftrag\n\n"); + type = strdup ("Sammelueberweisungsauftrag"); + else + type = strdup ("Sammelauftrag"); + + if (use_euro) + currency = strdup ("Euro"); else - fprintf(fbeleg, "\n Sammelauftrag\n\n"); + currency = strdup ("DM"); + + if (valA[A_TODO]) + sprintf (date_todo, valA[A_TODO]); + else + memset (date_todo, 0, sizeof (date_todo)); + + fprintf(fbeleg, "\n\n"); + fprintf(fbeleg, "\n Begleitzettel\n\n"); + fprintf(fbeleg, "\n Belegloser Datentraegeraustausch\n\n"); + fprintf(fbeleg, "\n %s\n\n", type); fprintf(fbeleg, "\n VOL ........................:\n"); fprintf(fbeleg, "\n Erstellungsdatum ...........: %s\n", get_date()); - fprintf(fbeleg, "\n Waehrung ...................: DM\n"); + if (date_todo) { + fprintf(fbeleg, "\n Ausfuehrungsdatum ..........: %s\n", date_todo); + } + fprintf(fbeleg, "\n Waehrung ...................: %s\n", currency); } if (!dtaus_writeA(fdtaus, valA)) { fprintf (stderr, "Konnte den Anfangsdatensatz nicht schreiben.\n"); @@ -986,7 +1242,10 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) else fprintf (fcheck, " Sammelauftrag\n\n"); fprintf (fcheck, " Erstellungsdatum : %s\n\n", get_date()); - fprintf (fcheck, " Waehrung : DM\n\n\n"); + if (use_euro) + fprintf (fcheck, " Waehrung : Euro\n\n\n"); + else + fprintf (fcheck, " Waehrung : DM\n\n\n"); fprintf (fcheck, " %-10s %-8s %-30s %12s\n", "Kontonr.", "BLZ", "Name", "Betrag"); fprintf (fcheck, " --------------------------------------------------------------------\n"); } else { @@ -1001,7 +1260,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) sum_val = bigint_int(0); sum_blz = bigint_int(0); sum_kto = bigint_int(0); - bzero(valC, sizeof(valC)); + memset (valC, 0, sizeof(valC)); control_nextline ((void *)line, 100, fcontrol); if (line[0] == '{') { while (strlen(line) && line[0] == '{') { @@ -1036,10 +1295,31 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) } } } else { - if ((valC[recindex] = (char *)malloc (strlen(line)+1))) - strcpy(valC[recindex], line); - else - return 0; + len = strlen(line); + if (recindex == C_VAL) { + /* Convert commast to dots for later processing */ + for (i=0; line[i]; i++) if (line[i] == ',') line[i] = '.'; + + if ((cp = index (line, '.')) == NULL) { + if (!(valC[recindex] = (char *)malloc (strlen(line)+4))) + return 0; + sprintf (valC[recindex], "%s.00", line); + } else if ( ((len = cp - line + 3)) < strlen (line)) { + if (!(valC[recindex] = (char *)malloc (len+1))) + return 0; + strncpy (valC[recindex], line, len); + valC[recindex][len] = '\0'; + } else { + if (!(valC[recindex] = (char *)malloc (strlen(line)+1))) + return 0; + strcpy(valC[recindex], line); + } + } else { + if ((valC[recindex] = (char *)malloc (strlen(line)+1))) + strcpy(valC[recindex], line); + else + return 0; + } } } control_nextline ((void *)line, 100, fcontrol); @@ -1057,7 +1337,7 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck) for (recindex=0; recindex