fixes #119, refs #117

CHANGES.rst

@@ -7,6 +7,11 @@ Change History
 Production
 **********
 
+:pending:
+
+    * `#119 <https://github.com/prjemian/spec2nexus/issues/119>`_
+       delimiters in #H/#V lines with or without text values
+
 :2017.901.4:
 
     * `#62 <https://github.com/prjemian/spec2nexus/issues/62>`_

src/spec2nexus/plugins/unicat_spec2nexus.py

@@ -19,6 +19,7 @@
 """
 
 
+import re
 from spec2nexus.plugin import ControlLineHandler
 from spec2nexus.utils import strip_first_word, split_column_labels
 from spec2nexus import eznx
@@ -52,7 +53,8 @@ class UNICAT_MetadataMnemonics(ControlLineHandler):
     key = '#H\d+'
 
     def process(self, text, spec_obj, *args, **kws):
-        spec_obj.H.append( strip_first_word(text).split() )
+        labels = strip_first_word(text).split()
+        spec_obj.H.append(labels)
 
 
 class UNICAT_MetadataValues(ControlLineHandler):
@@ -87,7 +89,14 @@ class UNICAT_MetadataValues(ControlLineHandler):
     key = '#V\d+'
 
     def process(self, text, scan, *args, **kws):
-        scan.V.append(split_column_labels(strip_first_word(text)))
+        index = len(scan.V)
+        row_text =  strip_first_word(text)
+        for delimiter in (r" "*2, r" "):
+            values = re.split(delimiter, row_text)
+            if len(scan.header.H[index]) == len(values):
+                    break
+        # issue #107: values = split_column_labels(row_text)
+        scan.V.append(values)
         scan.addPostProcessor('unicat_metadata', self.postprocess)
 
     def postprocess(self, scan, *args, **kws):

tests/__init__.py

@@ -36,6 +36,7 @@ def suite(*args, **kw):
     from tests import issue64
     from tests import issue99_hklscan
     from tests import issue107
+    from tests import issue119
     test_suite = unittest.TestSuite()
     test_list = [
         data_03_06_JanTest,

tests/issue107.py

@@ -51,7 +51,7 @@ def test_data_file(self):
         self.assertTrue(hasattr(scan.header, "H"))
         scan.interpret()
         self.assertTrue(hasattr(scan, "metadata"))
-        self.assertEqual(len(scan.metadata), 135)
+        self.assertEqual(len(scan.metadata), 140)
 
         self.assertTrue(isinstance(scan, spec2nexus.spec.SpecDataFileScan))