From cd9903abe4a0053fb5bcf9567c01ab0ee4dcee37 Mon Sep 17 00:00:00 2001
From: Jeremy Fee <jmfee@usgs.gov>
Date: Tue, 17 May 2016 10:32:40 -0600
Subject: [PATCH] Safer iaga2002 parsing and writing
---
geomagio/iaga2002/IAGA2002Parser.py | 11 +++++++----
geomagio/iaga2002/IAGA2002Writer.py | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/geomagio/iaga2002/IAGA2002Parser.py b/geomagio/iaga2002/IAGA2002Parser.py
index e81610d4b..637e7b79c 100644
--- a/geomagio/iaga2002/IAGA2002Parser.py
+++ b/geomagio/iaga2002/IAGA2002Parser.py
@@ -103,10 +103,13 @@ class IAGA2002Parser(object):
key = 'sensor_orientation'
elif key_upper == 'DIGITAL SAMPLING':
key = 'sensor_sampling_rate'
- if value.find('second') != -1:
- value = 1 / float(value.replace('second', '').strip())
- elif value.find('Hz') != -1:
- value = float(value.replace('Hz', '').strip())
+ try:
+ if value.find('second') != -1:
+ value = 1 / float(value.replace('second', '').strip())
+ elif value.find('Hz') != -1:
+ value = float(value.replace('Hz', '').strip())
+ except:
+ return
elif key_upper == 'DATA INTERVAL TYPE':
key = 'data_interval_type'
elif key_upper == 'DATA TYPE':
diff --git a/geomagio/iaga2002/IAGA2002Writer.py b/geomagio/iaga2002/IAGA2002Writer.py
index 6737274e9..decb59233 100644
--- a/geomagio/iaga2002/IAGA2002Writer.py
+++ b/geomagio/iaga2002/IAGA2002Writer.py
@@ -102,7 +102,7 @@ class IAGA2002Writer(object):
an array containing formatted strings of header data.
"""
comments = []
- if 'declination_base' in stats:
+ if 'declination_base' in stats and stats.declination_base is not None:
comments.append('DECBAS {:<8d}'
'(Baseline declination value in tenths of minutes East'
' (0-216,000)).'.format(stats.declination_base))
@@ -118,7 +118,7 @@ class IAGA2002Writer(object):
' INTERMAGNET DVD.')
comments.append('Go to www.intermagnet.org for details on' +
' obtaining this product.')
- if 'conditions_of_use' in stats:
+ if 'conditions_of_use' in stats and stats.conditions_of_use is not None:
comments.append('CONDITIONS OF USE: ' + stats.conditions_of_use)
# generate comment output
buf = []
--
GitLab