From 349c73b7cfcb7993ab7243c020ed525d3de7d05c Mon Sep 17 00:00:00 2001 From: Sven Giermann Date: Tue, 24 Nov 2015 20:00:37 +0100 Subject: [PATCH 1/2] Fix return definition in writes Add 3 more commas to skip field2 definition before defining result type. Print empty field1 definition if len[i]<=0. --- contrib/scripts/makegrabcsv.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/scripts/makegrabcsv.sh b/contrib/scripts/makegrabcsv.sh index 2cc46f89..1943fed6 100755 --- a/contrib/scripts/makegrabcsv.sh +++ b/contrib/scripts/makegrabcsv.sh @@ -52,8 +52,10 @@ END { printf substr(id,1,idlen*2) ",,," zz "," pbsb "," substr(id,1,idlen*2) if (length(id)/2>idlen) printf ",data,,HEX:" (length(id)/2-idlen) + else + printf ",,," if (len[i]>1) - printf ",result,s,HEX:" (len[i]-1) + printf ",,,,result,s,HEX:" (len[i]-1) print "" } else { printf "r,unknown" zz "," From baf03e634872e7c4ada9fc71a96d9850e9535683 Mon Sep 17 00:00:00 2001 From: Sven Giermann Date: Tue, 24 Nov 2015 20:02:12 +0100 Subject: [PATCH 2/2] Sort lines before uniq Uniq needs sorted lines, so sort them first. --- contrib/scripts/makegrabcsv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/scripts/makegrabcsv.sh b/contrib/scripts/makegrabcsv.sh index 1943fed6..1e8b3a0d 100755 --- a/contrib/scripts/makegrabcsv.sh +++ b/contrib/scripts/makegrabcsv.sh @@ -65,4 +65,4 @@ END { } } } -'|uniq +'|sort|uniq