fix record line regex for base_counter. Fixes MIT-LCP#121

cx1111 · cx1111 · commit 378a802ab9af · 2018-04-30T12:14:58.000-04:00
diff --git a/wfdb/io/_header.py b/wfdb/io/_header.py
@@ -118,9 +118,8 @@
 # Record line
 _rx_record = re.compile(''.join(
     ["(?P<record_name>[-\w]+)/?(?P<n_seg>\d*)[ \t]+",
-     "(?P<n_sig>\d+)[ \t]*",
-     "(?P<fs>\d*\.?\d*)/*(?P<counterfs>\d*\.?\d*)\(?(?P<base_counter>\d*\.?\d*)\)?[ \t]*",
-     "(?P<sig_len>\d*)[ \t]*",
+     "(?P<n_sig>\d+)[ \t]*(?P<fs>\d*\.?\d*)/*(?P<counter_freq>-?\d*\.?\d*)",
+     "\(?(?P<base_counter>-?\d*\.?\d*)\)?[ \t]*(?P<sig_len>\d*)[ \t]*",
      "(?P<base_time>\d{,2}:?\d{,2}:?\d{,2}\.?\d{,6})[ \t]*",
      "(?P<base_date>\d{,2}/?\d{,2}/?\d{,4})"])
 )
@@ -129,9 +128,10 @@
 _rx_signal = re.compile(''.join(
     ["(?P<file_name>~?[-\w]*\.?[\w]*)[ \t]+(?P<fmt>\d+)x?"
      "(?P<samps_per_frame>\d*):?(?P<skew>\d*)\+?(?P<byte_offset>\d*)[ \t]*",
-     "(?P<adc_gain>-?\d*\.?\d*e?[\+-]?\d*)\(?(?P<baseline>-?\d*)\)?/?(?P<units>[\w\^\-\?%]*)[ \t]*",
-     "(?P<adc_res>\d*)[ \t]*(?P<adc_zero>-?\d*)[ \t]*(?P<init_value>-?\d*)[ \t]*",
-     "(?P<checksum>-?\d*)[ \t]*(?P<block_size>\d*)[ \t]*(?P<sig_name>[\S]?[^\t\n\r\f\v]*)"])
+     "(?P<adc_gain>-?\d*\.?\d*e?[\+-]?\d*)\(?(?P<baseline>-?\d*)\)?",
+     "/?(?P<units>[\w\^\-\?%]*)[ \t]*(?P<adc_res>\d*)[ \t]*",
+     "(?P<adc_zero>-?\d*)[ \t]*(?P<init_value>-?\d*)[ \t]*(?P<checksum>-?\d*)",
+     "[ \t]*(?P<block_size>\d*)[ \t]*(?P<sig_name>[\S]?[^\t\n\r\f\v]*)"])
 )
 
 # Segment line
@@ -458,6 +458,9 @@ def wr_header_file(self, rec_write_fields, sig_write_fields, write_dir):
                                              string_field[:4]))
 
                 record_line += RECORD_SPECS.loc[field, 'delimiter'] + string_field
+                # The 'base_counter' field needs to be closed with ')'
+                if field == 'base_counter':
+                    record_line += ')'
 
         header_lines = [record_line]
 
diff --git a/wfdb/version.py b/wfdb/version.py
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = '2.1.0'`
	`1`	`+__version__ = '2.1.1'`