From fc07400653635c8065adad2edd5bfb3852113e56 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 19 May 2010 20:47:48 -0400
Subject: Switch the CSV format emitted by gpsdecode(1) to DSV using |.

The problem with CSV is that string fields (such as ship name in type 5) can
contain commas. I could have backslash-escaped them, but I think it's better
to make old scripts fail in a way that's likely to be noticed than perpetuate
a situation in which unescaped commas could cause output to be unpacked
wrongly. I changed the Python decoder as well.

Required rebuilding one regression test.  All regression tests pass.
---
 test/sample.aivdm.chk | 88 +++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

(limited to 'test/sample.aivdm.chk')

diff --git a/test/sample.aivdm.chk b/test/sample.aivdm.chk
index 72d383f2..6d4689fa 100644
--- a/test/sample.aivdm.chk
+++ b/test/sample.aivdm.chk
@@ -1,44 +1,44 @@
-1,0,371798000,0,-127,123,1,-74037230,29028980,2240,215,33,0x0,0,0x109c2
-1,0,440348000,0,-128,0,0,-42454920,25848090,934,511,13,0x0,0,0x103f4
-2,0,356302000,0,127,139,0,-42975686,24235415,877,91,41,0x0,0,0x1800c
-3,0,563808000,5,0,0,1,-45796520,22146000,2520,352,35,0x0,0,0x0
-4,0,003669702,2007:05:14T19:57:39Z,1,-45811417,22130260,7,0,0x105df
-5,0,351759000,9134270,0,3FOF8,EVER DIADEM,70,225,70,1,31,1,05-15T14:00Z,122,NEW YORK,0
-6,1,150834090,3,313240222,0,669,11,48:eb2f118f7ff1
-6,0,265538450,0,2655651,0,1,40,16:0000
-7,0,002655651,265538450,0,0,0
-7,1,655901842,158483613,321823389,836359488,0
-7,2,537411077,43101326,717096664,76161024,0
-8,0,366999712,366,22,256:3a53dbb7be4a773137f87d7b0445f040dea05d93f593783194ae9b9d9dbe05fb
-8,0,999999999,366,22,256:eb0d4f917a035b2dfca3d4739381735c18ebbe754936f66850037dcacd9538b8
-9,0,111265591,15,0,0,7128960,34667073,0,28,0x0,0,0,0x6015
-10,0,366814480,366832740
-10,0,440882000,366972000
-11,0,304137000,2009:05:22T02:22:40Z,1,-56644610,17045470,1,0,0x0
-12,0,002275200,0,215724000,0,PLEASE REPORT TO JOBOURG TRAFFIC CHANNEL 13 
-12,0,351853000,0,316123456,0,GOOD
-12,0,351853000,1,351809000,0,THANX
-12,0,271002099,0,271002111,1,MSG FROM 271002099
-12,1,237032000,3,2391100,1,EP 531 CARS 80 TRACKS 103 MOTO 5 CREW 86
-12,0,636012668,0,413118000,0,NI HAO.CALL TEST
-12,0,211217560,2,211378120,0,GUD PM 2U N HAPI NEW YIR OL D BES FRM AL FUJAIRAH
-13,0,211378120,211217560,0,0,0
-14,0,351809000,RCVD YR TEST MSG
-14,0,237008900,EP228 IX48 FG3 DK7 PL56.
-14,0,311764000,TEST
-15,0,368578000,5158,5,0,0,0,0,0,0
-15,3,003669720,367014320,3,516,5,617,0,0,0
-16,0,002053501,224251000,200,0,0,0,0
-17,0,002734450,17478,35992,376:7c0556c07031febbf52924fe33fa2933ffa0fd2932fdb7062922fe3809292afde9122929fcf7002923ffd20c29aaaa
-18,0,338087471,0,1,0,-44443279,24410724,796,511,49,0x0,1,0,1,1,1,1,0xe0006
-18,0,338088483,0,0,0,-42486718,25869335,1716,511,20,0x0,1,0,1,1,1,1,0xe0006
-18,0,368161000,0,51,1,-43340309,23688555,349,511,17,0x0,1,0,1,1,0,1,0xe0006
-19,0,367059850,248,87,0,-53286235,17726217,3359,511,46,0x4,CAPT.J.RIMES,70,5,21,4,4,0,0,0,0
-20,3,003669705,2182,5,7,225,0,0,0,0,0,0,0,0,0,0,0,0
-20,0,003160097,47,1,7,250,2250,1,7,1125,856,5,7,1125,0,0,0,0
-21,0,123456789,20,CHINA ROSE MURPHY EXPRESS ALERT,0,-73619155,28752371,5,5,5,5,1,50,165,0x0,0,0
-22,0,003160048,2087,2088,0,0,-44100,27330,-48100,25400,0,0,0,4
-23,0,002268120,1578,30642,1096,30408,6,0,2,9,0
-24,2,338085242,CAPTAIN'S PARADISE,54,ACR1234,WDD7883,8,3,2,1
-5,0,271010059,0,0,TCA2350,HEALTH CONTROL 13,55,6,10,2,2,1,00-00T24:60Z,20,,0
-5,0,271010059,0,0,TCA2350,HEALTH CONTROL 13,55,6,10,2,2,1,00-00T24:60Z,20,,0
+1|0|371798000|0|-127|123|1|-74037230|29028980|2240|215|33,0x0|0,0x109c2
+1|0|440348000|0|-128|0|0|-42454920|25848090|934|511|13,0x0|0,0x103f4
+2|0|356302000|0|127|139|0|-42975686|24235415|877|91|41,0x0|0,0x1800c
+3|0|563808000|5|0|0|1|-45796520|22146000|2520|352|35,0x0|0,0x0
+4|0|003669702|2007:05:14T19:57:39Z|1|-45811417|22130260|7|0,0x105df
+5|0|351759000|9134270|0|3FOF8|EVER DIADEM|70|225|70|1|31|1|05-15T14:00Z|122|NEW YORK|0
+6|1|150834090|3|313240222|0|669|11|48:eb2f118f7ff1
+6|0|265538450|0|2655651|0|1|40|16:0000
+7|0|002655651|265538450|0|0|0
+7|1|655901842|158483613|321823389|836359488|0
+7|2|537411077|43101326|717096664|76161024|0
+8|0|366999712|366|22|256:3a53dbb7be4a773137f87d7b0445f040dea05d93f593783194ae9b9d9dbe05fb
+8|0|999999999|366|22|256:eb0d4f917a035b2dfca3d4739381735c18ebbe754936f66850037dcacd9538b8
+9|0|111265591|15|0|0|7128960|34667073|0|28,0x0|0|0,0x6015
+10|0|366814480|366832740
+10|0|440882000|366972000
+11|0|304137000|2009:05:22T02:22:40Z|1|-56644610|17045470|1|0,0x0
+12|0|002275200|0|215724000|0|PLEASE REPORT TO JOBOURG TRAFFIC CHANNEL 13 
+12|0|351853000|0|316123456|0|GOOD
+12|0|351853000|1|351809000|0|THANX
+12|0|271002099|0|271002111|1|MSG FROM 271002099
+12|1|237032000|3|2391100|1|EP 531 CARS 80 TRACKS 103 MOTO 5 CREW 86
+12|0|636012668|0|413118000|0|NI HAO.CALL TEST
+12|0|211217560|2|211378120|0|GUD PM 2U N HAPI NEW YIR OL D BES FRM AL FUJAIRAH
+13|0|211378120|211217560|0|0|0
+14|0|351809000|RCVD YR TEST MSG
+14|0|237008900|EP228 IX48 FG3 DK7 PL56.
+14|0|311764000|TEST
+15|0|368578000|5158|5|0|0|0|0|0|0
+15|3|003669720|367014320|3|516|5|617|0|0|0
+16|0|002053501|224251000|200|0|0|0|0
+17|0|002734450|17478|35992|376:7c0556c07031febbf52924fe33fa2933ffa0fd2932fdb7062922fe3809292afde9122929fcf7002923ffd20c29aaaa
+18|0|338087471|0|1|0|-44443279|24410724|796|511|49,0x0|1|0|1|1|1|1,0xe0006
+18|0|338088483|0|0|0|-42486718|25869335|1716|511|20,0x0|1|0|1|1|1|1,0xe0006
+18|0|368161000|0|51|1|-43340309|23688555|349|511|17,0x0|1|0|1|1|0|1,0xe0006
+19|0|367059850|248|87|0|-53286235|17726217|3359|511|46,0x4|CAPT.J.RIMES|70|5|21|4|4|0|0|0|0
+20|3|003669705|2182|5|7|225|0|0|0|0|0|0|0|0|0|0|0|0
+20|0|003160097|47|1|7|250|2250|1|7|1125|856|5|7|1125|0|0|0|0
+21|0|123456789|20|CHINA ROSE MURPHY EXPRESS ALERT|0|-73619155|28752371|5|5|5|5|1|50|165,0x0|0|0
+22|0|003160048|2087|2088|0|0|-44100|27330|-48100|25400|0|0|0|4
+23|0|002268120|1578|30642|1096|30408|6|0|2|9|0
+24|2|338085242|CAPTAIN'S PARADISE,54,ACR1234|WDD7883,8|3|2|1
+5|0|271010059|0|0|TCA2350|HEALTH CONTROL 13|55|6|10|2|2|1|00-00T24:60Z|20||0
+5|0|271010059|0|0|TCA2350|HEALTH CONTROL 13|55|6|10|2|2|1|00-00T24:60Z|20||0
-- 
cgit v1.2.1