bug fix for SeaAndSun and Seabrid Nautilus driver

hyo/soundspeed/__init__.py

@@ -7,7 +7,7 @@
 log = logging.getLogger(__name__)
 log.addHandler(logging.NullHandler())
 
-__version__ = '2018.1.42'
+__version__ = '2018.1.43'
 __doc__ = "Sound Speed"
 __author__ = '[email protected]; [email protected]; [email protected]; ' \
  '[email protected]'

hyo/soundspeed/formats/readers/sea_and_sun.py

@@ -88,12 +88,18 @@ def _parse_header(self):
  date_string = None
 
  elif line_idx == 7: # vessel
- self.ssp.cur.meta.vessel = line.split(':')[1].strip().replace("\"", "")
+ try:
+ self.ssp.cur.meta.vessel = line.split(':')[1].strip().replace("\"", "")
+ except Exception as e:
+ logger.warning("unable to retrieve vessel name from %s, %s" % (line, e))
 
  elif line_idx == 8: # survey and date
  if date_string is None:
- self.ssp.cur.meta.survey = line.split()[2].strip().replace("\"", "")
- date_string = line.split()[-1].strip()
+ try:
+ self.ssp.cur.meta.survey = line.split()[2].strip().replace("\"", "")
+ date_string = line.split()[-1].strip()
+ except Exception as e:
+ logger.warning("unable to retrieve date from %s, %s" % (line, e))
 
  elif line_idx == 9: # latitude and longitude
  try:

hyo/soundspeed/formats/readers/seabird.py

@@ -295,6 +295,9 @@ def _parse_tsv_header(self):
  except Exception as e:
  logger.warning("unable to parse longitude: %s (%s)" % (fields[3], e))
 
+ if not self.ssp.cur.meta.original_path:
+ self.ssp.cur.meta.original_path = self.fid.path
+
  self.ssp.cur.init_data(len(self.lines) - 1)
 
  def _parse_body(self):

hyo/soundspeedmanager/__init__.py

@@ -6,7 +6,7 @@
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-__version__ = '2018.1.42'
+__version__ = '2018.1.43'
 __doc__ = "Sound Speed Manager"
 __author__ = '[email protected]; [email protected]; [email protected]; ' \
  '[email protected]'

hyo/soundspeedsettings/__init__.py

@@ -6,7 +6,7 @@
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-__version__ = '2018.1.42'
+__version__ = '2018.1.43'
 __doc__ = "Sound Speed Settings"
 __author__ = '[email protected]; [email protected]; [email protected]; ' \
  '[email protected]'

setup.py

@@ -33,7 +33,7 @@ def txt_read(*paths):
 setup_args = dict()
 
 setup_args['name'] = 'hyo.soundspeed'
-setup_args['version'] = '2018.1.42'
+setup_args['version'] = '2018.1.43'
 setup_args['url'] = 'https://bitbucket.org/ccomjhc/hyo_soundspeed/'
 setup_args['license'] = 'LGPLv2.1 or CCOM-UNH Industrial Associate license'
 setup_args['author'] = 'Giuseppe Masetti(UNH,CCOM); Barry Gallagher(NOAA,OCS); ' \