Merge pull request MIT-LCP#232 from maksteel/units_regex_231

Lucas-Mc · web-flow · commit 9b97885beb63 · 2020-06-09T07:48:51.000-04:00
updated regex to correctly parse units
diff --git a/wfdb/io/_header.py b/wfdb/io/_header.py
@@ -107,7 +107,7 @@
     ["(?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<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]*)"])
 )

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@`
`107`	`107`	`["(?P<file_name>~?[-\w]\.?[\w])[ \t]+(?P<fmt>\d+)x?"`
`108`	`108`	`"(?P<samps_per_frame>\d):?(?P<skew>\d)\+?(?P<byte_offset>\d)[ \t]",`
`109`	`109`	`"(?P<adc_gain>-?\d\.?\de?[\+-]?\d)\(?(?P<baseline>-?\d)\)?",`
`110`		`- "/?(?P<units>[\w\^\-\?%])[ \t](?P<adc_res>\d)[ \t]",`
	`110`	`+ "/?(?P<units>[\w\^\-\?%\/])[ \t](?P<adc_res>\d)[ \t]",`
`111`	`111`	`"(?P<adc_zero>-?\d)[ \t](?P<init_value>-?\d)[ \t](?P<checksum>-?\d*)",`
`112`	`112`	`"[ \t](?P<block_size>\d)[ \t](?P<sig_name>[\S]?[^\t\n\r\f\v])"])`
`113`	`113`	`)`