Intégration de la branche release-3.4.1
This commit is contained in:
commit
8a34724f80
|
@ -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
|
||||
|
|
|
@ -1 +1 @@
|
|||
3.4.0
|
||||
3.4.1
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue