From a702b8953e2801263f19ef9facf2497531599169 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Wed, 10 Feb 2016 11:45:24 +0400 Subject: [PATCH 1/2] mergecsv: bug quand left ne contient qu'un seul champ vide --- lib/ulib/awk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ulib/awk b/lib/ulib/awk index 15bb948..63afe19 100644 --- a/lib/ulib/awk +++ b/lib/ulib/awk @@ -1448,8 +1448,8 @@ function printmerged(lline, rline, nocopy, linecsv, tmplinecsv) { } linecsv = array_formatcsv(lfields) tmplinecsv = array_formatcsv(rfields) - if (tmplinecsv != "") { - if (linecsv != "") linecsv = linecsv "," + if (array_len(rfields) > 0) { + if (array_len(lfields) > 0) linecsv = linecsv "," linecsv = linecsv tmplinecsv } print linecsv From c0afa5d32d4d07c73589efd45e89349f424a7665 Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Wed, 10 Feb 2016 11:45:30 +0400 Subject: [PATCH 2/2] Init changelog & version 3.4.1 --- CHANGES.txt | 4 ++++ VERSION.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index e738a63..bd9175a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +## Version 3.4.1 du 10/02/2016-11:45 + +a702b89 mergecsv: bug quand left ne contient qu'un seul champ vide + ## Version 3.4.0 du 09/02/2016-11:25 788e1ff cgilsxml.py: ajout de l'option -E. bug avec le tri sur des valeurs inexistantes diff --git a/VERSION.txt b/VERSION.txt index 1809198..47b322c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.4.0 +3.4.1