Added support for the 'Begleitzettel' via LaTeX document with -l

[infodrom/dtaus] / dtaus.c

diff --git a/dtaus.c b/dtaus.c
index e533b67..f9eb30b 100644 (file)
--- a/dtaus.c
+++ b/dtaus.c
@@ -273,6 +273,7 @@ char *real2string(char *s)
 {
   static char res[20];
   char *cp;
+  char *xp;    /* only to avoid a GCC warning */
 
   strncpy(res, s, sizeof(res)-1);
   res[sizeof(res)-1] = 0;
@@ -287,13 +288,15 @@ char *real2string(char *s)
   if (*cp == '.' || *cp == ',') {
     if (*(cp+1)) {
       /* 1st decimal place */
-      if (isdigit(*(cp+1)))
-       *(cp++) = *(cp+1);
+      xp = cp+1;
+      if (*xp && isdigit(*xp))
+       *(cp++) = *xp;
       else
        *(cp++) = '0';
       /* 2nd decimal place */
-      if (*(cp+1) && isdigit(*(cp+1)))
-       *(cp++) = *(cp+1);
+      xp = cp+1;
+      if (*xp && isdigit(*xp))
+       *(cp++) = *xp;
       else
        *(cp++) = '0';
     } else {
@@ -1122,7 +1125,6 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
   void *buf;
   char *ident;
   int  recindex;
-  char tmp[30];
   char line[100];
   char *valA[A_LEN], *valC[C_LEN];
   int count;
@@ -1131,6 +1133,10 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
   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")))
@@ -1194,24 +1200,33 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
       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
-       fprintf(fbeleg, "\n    Sammelauftrag\n\n");
+       type = strdup ("Sammelauftrag");
+
+      if (use_euro)
+       currency = strdup ("Euro");
+      else
+       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());
-      if (valA[A_TODO]) {
-       fprintf(fbeleg, "\n    Ausfuehrungsdatum ..........: %s\n", valA[A_TODO]);
+      if (date_todo) {
+       fprintf(fbeleg, "\n    Ausfuehrungsdatum ..........: %s\n", date_todo);
       }
-      if (use_euro)
-       fprintf(fbeleg, "\n    Waehrung ...................: Euro\n");
-      else
-       fprintf(fbeleg, "\n    Waehrung ...................: DM\n");
+      fprintf(fbeleg, "\n    Waehrung ...................: %s\n", currency);
     }
     if (!dtaus_writeA(fdtaus, valA)) {
       fprintf (stderr, "Konnte den Anfangsdatensatz nicht schreiben.\n");
@@ -1334,19 +1349,19 @@ int control2dtaus (char *ccontrol, char *cdtaus, char *cbeleg, char *ccheck)
    */
   dtaus_writeE(fdtaus, count, sum_val, sum_blz, sum_kto);
   fprintf (fcheck, "    --------------------------------------------------------------------\n");
-  bigint_sprintf (tmp, "%s", sum_val);
   fprintf (fbeleg, "\n    Anzahl .....................: %d\n", count);
-  recindex=strlen(tmp);
-  tmp[recindex+1] = '\0';
-  tmp[recindex] = tmp[recindex-1];
-  tmp[recindex-1] = tmp[recindex-2];
-  tmp[recindex-2] = '.';
-  fprintf (fcheck, "     %-52s %14s\n", "Summe", tmp);
-  fprintf (fbeleg, "\n    Summe ......................: %s\n", tmp);
-  bigint_sprintf (tmp, "%s", sum_kto);
-  fprintf (fbeleg, "\n    Kontrollsumme Kontonummern .: %s\n", tmp);
-  bigint_sprintf (tmp, "%s", sum_blz);
-  fprintf (fbeleg, "\n    Kontrollsumme Bankleitzahlen: %s\n", tmp);
+  bigint_sprintf (ssum_val, "%s", sum_val);
+  recindex=strlen(ssum_val);
+  ssum_val[recindex+1] = '\0';
+  ssum_val[recindex] = ssum_val[recindex-1];
+  ssum_val[recindex-1] = ssum_val[recindex-2];
+  ssum_val[recindex-2] = '.';
+  fprintf (fcheck, "     %-52s %14s\n", "Summe", ssum_val);
+  fprintf (fbeleg, "\n    Summe ......................: %s\n", ssum_val);
+  bigint_sprintf (ssum_kto, "%s", sum_kto);
+  fprintf (fbeleg, "\n    Kontrollsumme Kontonummern .: %s\n", ssum_kto);
+  bigint_sprintf (ssum_blz, "%s", sum_blz);
+  fprintf (fbeleg, "\n    Kontrollsumme Bankleitzahlen: %s\n", ssum_blz);
   fprintf (fbeleg, "\n    Unsere Kontonummer .........: %s\n", valA[A_KTO]);
   fprintf (fbeleg, "\n    Unsere Bankleitzahl ........: %s\n", valA[A_BLZ]);
   fprintf (fbeleg, "\n\n\n\n\n    __________________________________________________\n");