Refactor some code generation. All regression tests pass.

1 files changed, 38 insertions, 39 deletions

diff --git a/jsongen.py.in b/jsongen.py.in
index ad90b402..242abfbe 100644
--- a/jsongen.py.in
+++ b/jsongen.py.in
@@ -279,53 +279,52 @@ ais_specs = (
     {
     "initname" : "json_ais8_fid29",
     "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8",
+    "structname": "ais->type8.dac1fid29",
     "fieldmap":(
-        # fieldname               type             default
-        ('dac1fid29.linkage',     'uinteger',      '0'),
-        ('dac1fid29.text',        'string',        '0'),
+        # fieldname     type             default
+        ('linkage',     'uinteger',      '0'),
+        ('text',        'string',        '0'),
         ),
     "stringbuffered":("dacfid29.text",),
     },
     {
     "initname" : "json_ais8_fid31",
     "headers": ("AIS_HEADER","AIS_TYPE8",),
-    "structname": "ais->type8",
+    "structname": "ais->type8.dac1fid31",
     "fieldmap":(
-        # fieldname             type         default
-        ('dac1fid31.lon',      'integer',   'DAC1FID31_LON_NOT_AVAILABLE'),
-        ('dac1fid31.lat',      'integer',   'DAC1FID31_LAT_NOT_AVAILABLE'),
-        ('dac1fid31.accuracy', 'boolean',   'false'),
-        ('timestamp',          "string",    None),
-        ('dac1fid31.wspeed',   'uinteger',  'DAC1FID31_WIND_NOT_AVAILABLE'),
-        ('dac1fid31.wgust ',   'uinteger',  'DAC1FID31_WIND_NOT_AVAILABLE'),
-        ('dac1fid31.wdir',     'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.wgustdir', 'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.airtemp',  'integer',   'DAC1FID31_AIRTEMP_NOT_AVAILABLE'),
-        ('dac1fid31.pressure', 'uinteger',  'DAC1FID31_PRESSURE_NOT_AVAILABLE'),
-        ('dac1fid31.pressuretend', 'uinteger', 'DAC1FID31_PRESSURETREND_NOT_AVAILABLE'),
-        ('dac1fid31.visibility',   'uinteger', 'DAC1FID31_VISIBILITY_NOT_AVAILABLE'),
-        ('dac1fid31.visgreater',   'boolean',  'false'),
-        ('dac1fid31.waterlevel',   'integer',  'DAC1FID31_WATERLEVEL_NOT_AVAILABLE'),
-        ('dac1fid31.leveltrend',   'uinteger', 'DAC1FID31_LEVELTREND_NOT_AVAILABLE'),
-        ('dac1fid31.cspeed',   'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('dac1fid31.cdir',     'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.cspeed2',  'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('dac1fid31.cdir2',    'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.cdepth2',  'uinteger',  'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
-        ('dac1fid31.cspeed3',  'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
-        ('dac1fid31.cdir3',    'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.cdepth3',  'uinteger',  'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
-        ('dac1fid31.waveheight',  'uinteger',  'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
-        ('dac1fid31.waveperiod',  'uinteger',  'DAC1FID31_PERIOD_NOT_AVAILABLE'),
-        ('dac1fid31.wavedir',     'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.swellheight', 'uinteger',  'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
-        ('dac1fid31.swellperiod', 'uinteger',  'DAC1FID31_PERIOD_NOT_AVAILABLE'),
-        ('dac1fid31.swelldir',    'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
-        ('dac1fid31.seastate',    'uinteger',  'DAC1FID31_SEASTATE_NOT_AVAILABLE'),
-        ('dac1fid31.preciptype',  'uinteger',  'DAC1FID31_PRECIPTYPE_NOT_AVAILABLE'),
-        ('dac1fid31.salinity',    'uinteger',  'DAC1FID31_SALINITY_NOT_AVAILABLE'),
-        ('dac1fid31.ice',      'boolean',      'false'),
+        # fieldname      type         default
+        ('lon',          'integer',   'DAC1FID31_LON_NOT_AVAILABLE'),
+        ('lat',          'integer',   'DAC1FID31_LAT_NOT_AVAILABLE'),
+        ('accuracy',     'boolean',   'false'),
+        ('wspeed',       'uinteger',  'DAC1FID31_WIND_NOT_AVAILABLE'),
+        ('wgust ',       'uinteger',  'DAC1FID31_WIND_NOT_AVAILABLE'),
+        ('wdir',         'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('wgustdir',     'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('airtemp',      'integer',   'DAC1FID31_AIRTEMP_NOT_AVAILABLE'),
+        ('pressure',     'uinteger',  'DAC1FID31_PRESSURE_NOT_AVAILABLE'),
+        ('pressuretend', 'uinteger',  'DAC1FID31_PRESSURETREND_NOT_AVAILABLE'),
+        ('visibility',   'uinteger',  'DAC1FID31_VISIBILITY_NOT_AVAILABLE'),
+        ('visgreater',   'boolean',   'false'),
+        ('waterlevel',   'integer',   'DAC1FID31_WATERLEVEL_NOT_AVAILABLE'),
+        ('leveltrend',   'uinteger',  'DAC1FID31_LEVELTREND_NOT_AVAILABLE'),
+        ('cspeed',       'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+        ('cdir',         'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('cspeed2',      'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+        ('cdir2',        'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('cdepth2',      'uinteger',  'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
+        ('cspeed3',      'uinteger',  'DAC1FID31_CSPEED_NOT_AVAILABLE'),
+        ('cdir3',        'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('cdepth3',      'uinteger',  'DAC1FID31_CDEPTH_NOT_AVAILABLE'),
+        ('waveheight',   'uinteger',  'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
+        ('waveperiod',   'uinteger',  'DAC1FID31_PERIOD_NOT_AVAILABLE'),
+        ('wavedir',      'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('swellheight',  'uinteger',  'DAC1FID31_HEIGHT_NOT_AVAILABLE'),
+        ('swellperiod',  'uinteger',  'DAC1FID31_PERIOD_NOT_AVAILABLE'),
+        ('swelldir',     'uinteger',  'DAC1FID31_DIR_NOT_AVAILABLE'),
+        ('seastate',     'uinteger',  'DAC1FID31_SEASTATE_NOT_AVAILABLE'),
+        ('preciptype',   'uinteger',  'DAC1FID31_PRECIPTYPE_NOT_AVAILABLE'),
+        ('salinity',     'uinteger',  'DAC1FID31_SALINITY_NOT_AVAILABLE'),
+        ('ice',          'boolean',   'false'),
         ),
     "stringbuffered":("timestamp",),
     },