Merge pull request #531 from jgrewe/str2ddataarray

[h5dataset] change string conversion to work with more than 1d

Author: mpsonntag

nixio/hdf5/h5dataset.py

@@ -61,7 +61,7 @@ def read_data(self, slc=None):
             # Let's change it to IndexError
             raise IndexError(te_exc)
         if data.dtype == util.vlen_str_dtype:
-            data = np.array([ensure_str(s) for s in data], dtype=util.vlen_str_dtype)
+            data = np.reshape(np.array(list(map(ensure_str, data.ravel()))), data.shape)
         elif data.dtype.fields:
             data = self._convert_string_cols(data)
         return data

nixio/test/test_data_view.py

@@ -33,6 +33,21 @@ def test_data_view_read(self):
         dv = da.get_slice((10, 3), extents=(1, 3))
         np.testing.assert_almost_equal(dv[:], da[10:11, 3:6])
 
+    def test_data_view_read_2d_str_array(self):
+        numbers = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"]
+        data = np.empty((10, 4), dtype=str)
+        for i in range(10):
+            for j in range(4):
+                data[i, j] = " ".join([numbers[i], numbers[j]])
+        da = self.file.blocks[0].create_data_array("str_2d_array", "test", dtype=nix.DataType.String, data=data)
+        da.append_set_dimension()
+        da.append_set_dimension()
+        
+        dv = da.get_slice((0, 0), extents=(10, 4))
+        npeq = np.testing.assert_equal
+        npeq(dv.shape, da.shape)
+        npeq(dv[:], data)
+
     def test_data_view_fancy_slicing(self):
         da = self.file.blocks[0].data_arrays[0]
         dv = da.get_slice((5, 8), extents=(10, 20))