generating todo file to transfer Email is working

diff --git a/app/sorter.c b/app/sorter.c
index c5b6aada485a1f17d2de7fd51a9e4a979141a593..03ce0eb57a1e290b2180b532292c2002783a4cf5 100644 (file)
--- a/app/sorter.c
+++ b/app/sorter.c
@@ -46,7 +46,6 @@ while (proceed==true) {
   switch (phase) {
     case 0      :       //Getting the list of file
       fname=eml_getqfilelist(fname,".trans");
-      fname=eml_getqfilelist(fname,".todo");
       if (fname==(char **)0)
         phase=999;      //Nothing to do
       break;
@@ -62,13 +61,14 @@ while (proceed==true) {
           if ((qfile=eml_openqfile(*ptr))!=(FILE *)0) {
             trans=eml_scanqfile(trans,qfile);
             (void) eml_closeqfile(qfile);
+            (void) eml_deleteqfile(*ptr);
             }
           ptr++;
           }
         fname=(char **)rou_freelist((void *)fname,(freehandler_t)rou_freestr); 
         }
       break;
-    case 2      :       //Cscanning translit
+    case 2      :       //scanning translit
       if (trans!=(TRATYP **)0) {
         TRATYP **ptr;
 

diff --git a/lib/Makefile b/lib/Makefile
index 02764abc9c4d1cc85b6626ccdb125fbb06796c42..1fe3def1bd14c877dd571ef22495e377fa0c068e 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -48,6 +48,7 @@ gesspf.o:                                     \
 
 geseml.o:                                      \
           subrou.h                             \
+          unieml.h                             \
           geseml.h geseml.h
 
 gestcp.o:                                      \

diff --git a/lib/geseml.c b/lib/geseml.c
index cd575fe9ce6c048026e6b14cfc6736f51d645d73..6916ae00e712dd80c9771afd80d6e4d984164777 100644 (file)
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -8,6 +8,7 @@
 #include        <string.h>
 
 #include       "subrou.h"
+#include       "unieml.h"
 #include       "geseml.h"
 
 typedef struct  {
@@ -77,16 +78,24 @@ while (proceed==true) {
         phase=999;    //No dmain
         }
       break;
-    case 2    :       //do we know domain
+    case 2    :       //do we have domain
+      dom++;
+      if (strlen(dom)==0) {
+        (void) rou_alert(0,"%s Domain length from < <%s> is zero  (Bug?)",
+                            OPEP,trans->rcptto);
+        phase=999;    //No dmain
+        }
+      break;
+    case 3    :       //do we know domain
       if ((ref=findref(reflist,dom))!=(REFTYP *)0)
         phase++;      //we have reference already
       break;
-    case 3    :       //Adding reference
+    case 4    :       //Adding reference
       ref=(REFTYP *)calloc(1,sizeof(REFTYP));
       ref->domain=dom;
       reflist=(REFTYP **)rou_addlist((void **)reflist,(void *)ref);
       break;
-    case 4    :       //Adding transaction within reference
+    case 5    :       //Adding transaction within reference
       ref->todo=(TRATYP **)rou_addlist((void **)ref->todo,(void *)trans);
       break;
     default   :       //SAFE Guard
@@ -106,19 +115,26 @@ return reflist;
 /*      Procedure to display/debug TRATYP record content*/
 /*                                                      */
 /********************************************************/
-PUBLIC void eml_dumptra(TRATYP *tra)
+PUBLIC void eml_dumptra(FILE *out,TRATYP *tra)
 
 {
+char line[300];
+
+(void) strcpy(line,"Empty");
 if (tra!=(TRATYP *)0) {
-  (void) rou_alert(0,"TRA-> %c,%lu,%u %s %s %s",
-                      tra->code,
-                      tra->date,
-                      tra->delay,
-                      tra->sessid,
-                      tra->mailfrom,
-                      tra->rcptto
-                  );
+  (void) snprintf(line,sizeof(line),"%c,%lu,%u %s %s %s",
+                                    tra->code,
+                                    tra->date,
+                                    tra->delay,
+                                    tra->sessid,
+                                    tra->mailfrom,
+                                    tra->rcptto
+                                    );
   }
+if (out==(FILE *)0) 
+  (void) rou_alert(0,"TRA=<%s>",line);
+else
+  (void) fprintf(out,"%s\n",line);
 }
 /*
 \f
@@ -194,7 +210,6 @@ while ((ptr=fgets(line,sizeof(line),qfile))!=(char *)0) {
           tra->sessid=strdup(id);
           tra->mailfrom=strdup(from);
           tra->rcptto=strdup(to);
-          (void) eml_dumptra(tra);
           list=(TRATYP **)rou_addlist((void **)list,(void *)tra); 
           }
         break;
@@ -232,22 +247,56 @@ while (*list!=(TRATYP *)0) {
   list++;
   }
 if (domlist!=(REFTYP **)0) {
+  int iter;
+  time_t current;
+  struct tm *tinfo;
+  char buffer[80];
   REFTYP **ptr;
 
+  iter=0;
+  (void) time(&current );
+  tinfo=localtime(&current);
+  (void) strftime(buffer,sizeof(buffer),"%s",tinfo);
   ptr=domlist;
   while (*ptr!=(REFTYP *)0) {
-    (void) rou_alert(0,"%s JMPDBG refdomain=<%s>",OPEP,(*ptr)->domain);
-    if ((*ptr)->todo!=(TRATYP **)0) {
-      TRATYP **todo;
+    FILE *qfile;
+    char qname[150];
+    int phase;
+    _Bool proceed;
+   
+    qfile=(FILE *)0;
+    (void) snprintf(qname,sizeof(qname),"%s-%s-%04d",(*ptr)->domain,buffer,iter);
+    phase=0;
+    proceed=true;
+    while (proceed==true) {
+      switch (phase) {
+        case 0  :       //Opening qfile
+          if ((qfile=eml_createqfile(qname,"todo"))==(FILE *)0) 
+            phase=999;  //Trouble trouble
+          break;
+        case 1  :       //Opening qfile
+          if ((*ptr)->todo!=(TRATYP **)0) {
+            TRATYP **todo;
 
-      todo=(*ptr)->todo;
-      while (*todo!=(TRATYP *)0) {
-        (void) eml_dumptra(*todo);
-        todo++;
+            todo=(*ptr)->todo;
+            while (*todo!=(TRATYP *)0) {
+              (void) eml_dumptra(qfile,*todo);
+              todo++;
+              }
+            }
+          break;
+        case 2  :       //Closing file
+          (void) eml_closeqfile(qfile);
+          break;
+        default :       //SAFE Guard
+          proceed=false;
+          break;
         }
-      }
+      phase++;
+      } 
     (void) free(*ptr);
     ptr++;
+    iter++;
     }
   (void) free(domlist);
   }

diff --git a/lib/geseml.h b/lib/geseml.h
index b242e2e051a3348eefb7de166497726c8624ed55..06fb58ec0db71f88b408a44d78d5dbb2a8c03f7a 100644 (file)
--- a/lib/geseml.h
+++ b/lib/geseml.h
@@ -22,7 +22,7 @@ typedef struct  {
         }TRATYP;
 
 //procedure to dump a transfert record (debug purpose)
-extern void eml_dumptra(TRATYP *tra);
+extern void eml_dumptra(FILE *out,TRATYP *tra);
 
 //procedure to fee memory used by a TRATYP structure
 extern TRATYP *eml_freetra(TRATYP *tra);

diff --git a/lib/unieml.c b/lib/unieml.c
index a59d2ef3724b69b0f02a8050b5e21f1795aeb210..550c2854a9c95891c4a2ed06a197f1eefe95b90f 100644 (file)
--- a/lib/unieml.c
+++ b/lib/unieml.c
@@ -194,7 +194,7 @@ return status;
 PUBLIC _Bool eml_deleteqfile(char *qfilename)
 
 {
-#define OPEP    "unieml.c:eml_createqfile,"
+#define OPEP    "unieml.c:eml_deleteqfile,"
 
 _Bool done;
 char *filename;
@@ -242,7 +242,7 @@ while (proceed==true) {
   switch (phase) {
     case 0      :       //Do we have a session ID
       if ((qfilename==(char *)0)||(strlen(qfilename)==0)) {
-        (void) rou_core_dump("%s sessionID is not set (bug?)",OPEP);
+        (void) rou_core_dump("%s qfilename is not set (bug?)",OPEP);
         phase=999;      //never reached
         }
       break;