From: Jean-Marc Pigeon (Delson) <jmp@safe.ca>
Date: Sun, 1 Jun 2025 14:28:41 +0000 (-0400)
Subject: Improving test about sorter
X-Git-Tag: tag-0.8~76
X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=58be18910bb2c8f017a05dd1d45d6761e4f5ad1f;p=jmp%2Fmailleur

Improving test about sorter
---

diff --git a/Makefile b/Makefile
index 1bbe724..fff124b 100644
--- a/Makefile
+++ b/Makefile
@@ -45,10 +45,13 @@ sorter	:  clean debug
 		data-$@/*				\
 	   	$(TESTDIR)/var/spool/$(APPNAME)/queue
 	   @ bin/sorter					\
-		   -f					\
+		   -f 					\
 		   -d 2					\
 	   	   -c ./conf/mailleur.conf.dvl		\
 		   -r $(TESTDIR) 
+	   @ cp -a					\
+		$(TESTDIR)/var/spool/$(APPNAME)/queue/*	\
+		./data-sender/				\
 		
 sorter2	:  clean debug newtest
 	   @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue
@@ -122,6 +125,8 @@ extfeed	:	debug
 		  	./$(DATATST)/extfeed00.tst
 
 onefeed	:  debug
+	   @ rm -fr ./data-queue/*
+	   @ rm -fr $(TESTDIR)/var/spool/$(APPNAME)/queue/*
 	   @ bin/feeder					\
 			-f				\
 			-d2				\
@@ -129,6 +134,11 @@ onefeed	:  debug
 			$(TESTIP)			\
 			$(TESTPORT)			\
 		  	./$(DATATST)/xxfeed.tst
+	   @ rm -fr ./data-sorter/*
+	   @ cp -a					\
+		$(TESTDIR)/var/spool/$(APPNAME)/queue/* \
+		./data-sorter
+		
 
 #			# -i 127.63.31.15
 
@@ -139,9 +149,11 @@ tstfeed	:  debug newtest
 	   @ bin/feeder					\
 			  -c ./conf/feeder.conf.dvl	\
 			 $(FEEDPAR)
+	   @ rm -fr ./data-sorter/*
 	   @ cp -a					\
 		$(TESTDIR)/var/spool/$(APPNAME)/queue/* \
-		./data-queue
+		./data-sorter
+		
 		
 
 #using gdb
@@ -289,7 +301,8 @@ prepare	:  debug newtest
 
 #to kill all remaining emlrcvr process
 killall	:
-	  @ kill -9 emlrcvr
+	  @ - kill -9 emlrcvr
+	  @ - kill -9 sorter
 
 #--------------------------------------------------------------------
 #test procedure
diff --git a/app/sorter.c b/app/sorter.c
index 768d0e1..0a5dd48 100644
--- a/app/sorter.c
+++ b/app/sorter.c
@@ -40,7 +40,7 @@ trans=(TRATYP **)0;
 phase=0;
 proceed=true;
 while (proceed==true) {
-  (void) fprintf(stdout,"%s JMPDBG phase='%d' ext=<%s>\n",OPEP,phase,ext);
+  //(void) fprintf(stdout,"%s JMPDBG phase='%d' ext=<%s>\n",OPEP,phase,ext);
   switch (phase) {
     case 0      :       //Getting the list of file
       fname=eml_getqfilelist(fname,ext);
@@ -106,11 +106,10 @@ _Bool proceed;
 
 status=0;
 params=(ARGTYP *)0;
-foreground=true;
 phase=0;
 proceed=true;
 while (proceed==true) {
-  //(void) fprintf(stdout,"JMPDBG main phase='%d'\n",phase);
+  (void) fprintf(stdout,"JMPDBG main phase='%d' foreground='%d'\n",phase,foreground);
   switch (phase) {
     case 0      :       //checking parameters
       if ((params=par_getparams(argc,argv,"c:d:fhi:r:v"))==(ARGTYP *)0) {
diff --git a/lib/geseml.c b/lib/geseml.c
index 0fb2069..e30b1b6 100644
--- a/lib/geseml.c
+++ b/lib/geseml.c
@@ -126,15 +126,18 @@ PUBLIC void eml_dumptra(FILE *qfile,TRATYP **tra)
 if (tra!=(TRATYP **)0) {
   if (qfile!=(FILE *)0) {
     (void) fprintf(qfile,"#'C', completed email task\n");
-    (void) fprintf(qfile,"#'D', delayed email\n");
     (void) fprintf(qfile,"#'L', Local email\n");
-    (void) fprintf(qfile,"#'O', Obsolete email\n");
     (void) fprintf(qfile,"#'R', Remote email\n");
+    (void) fprintf(qfile,"#code\tdate\t\tdelay\tsession-id\t\t\t"
+                         "originator\t\trecipient\n");
     }
   while (*tra!=(TRATYP *)0) {
+    char temps[50];
     char line[300];
 
-    (void) snprintf(line,sizeof(line),"%c %lu %04u %s %s %s",
+    (void) strftime(temps,sizeof(temps),"#%Y-%m-%d %H:%M:%S",
+                                        localtime(&((*tra)->date)));
+    (void) snprintf(line,sizeof(line),"%c\t%lu\t%04u\t%s\t%s\t%s",
                                       (*tra)->code,
                                       (*tra)->date,
                                       (*tra)->delay,
@@ -142,10 +145,13 @@ if (tra!=(TRATYP **)0) {
                                       (*tra)->mailfrom,
                                       (*tra)->rcptto
                                       );
-    if (qfile==(FILE *)0) 
+    if (qfile==(FILE *)0)  {
       (void) rou_alert(0,"TRA=<%s>",line);
-    else
+      }
+    else {
+      (void) fprintf(qfile,"%s\n",temps);
       (void) fprintf(qfile,"%s\n",line);
+      }
     tra++;
     }
   }