fixed bug with scalar dataset with array type

Author: jreadey

data/hdf5/scalar_array_dset.h5

@@ -0,0 +1,61 @@
+{
+    "apiVersion": "1.1.0",
+    "datasets": {
+        "8752a454-05e2-11e7-900a-3c15c2da029e": {
+            "alias": [
+                "/DS1"
+            ],
+            "creationProperties": {
+                "allocTime": "H5D_ALLOC_TIME_LATE",
+                "fillTime": "H5D_FILL_TIME_IFSET",
+                "layout": {
+                    "class": "H5D_CONTIGUOUS"
+                }
+            },
+            "shape": {
+                "class": "H5S_SCALAR"
+            },
+            "type": {
+                "base": {
+                    "base": "H5T_IEEE_F32LE",
+                    "class": "H5T_FLOAT"
+                },
+                "class": "H5T_ARRAY",
+                "dims": [
+                    3,
+                    2
+                ]
+            },
+            "value": [
+                [
+                    0.0,
+                    0.0
+                ],
+                [
+                    0.0,
+                    0.0
+                ],
+                [
+                    0.0,
+                    0.0
+                ]
+            ]
+        }
+    },
+    "groups": {
+        "8750b178-05e2-11e7-b6e4-3c15c2da029e": {
+            "alias": [
+                "/"
+            ],
+            "links": [
+                {
+                    "class": "H5L_TYPE_HARD",
+                    "collection": "datasets",
+                    "id": "8752a454-05e2-11e7-900a-3c15c2da029e",
+                    "title": "DS1"
+                }
+            ]
+        }
+    },
+    "root": "8750b178-05e2-11e7-b6e4-3c15c2da029e"
+}

data/json/scalar_array_dset.json

@@ -822,9 +822,10 @@ def getShapeItemByDsetObj(self, obj):
             # this by seeing if an exception is raised when reading the dataset
             # h5py issue https://github.com/h5py/h5py/issues/279 will provide a
             # better way to determine null spaces
+            # Update 3/10/17: Above issue is closed, but waiting on 2.7 final release
             try:
                 val = obj[...]
-                if not val:
+                if val is None:
                     self.log.warning("no value returned for scalar dataset")
                 item['class'] = 'H5S_SCALAR'
             except IOError:
@@ -2118,7 +2119,7 @@ def getDatasetValuesByUuid(self, obj_uuid, slices=Ellipsis, format="json"):
             except IOError:
                 # assume null dataspace, return none
                 return None
-            if not val:
+            if val is None:
                 self.log.warning("no value returned from scalar dataset")
 
         if type(slices) != list and type(slices) != tuple and slices is not Ellipsis:

h5json/hdf5db.py

@@ -82,6 +82,7 @@
     "resizable.h5",
     "sample.h5",
     "scalar.h5",
+    "scalar_array_dset.h5",
     "scalar_attr.h5",
     "tall.h5",
     "tall_with_udlink.h5",

test/integ/h5tojson_test.py

@@ -76,6 +76,7 @@
     # "sample.json",
     "scalar.json",
     #"scalar_attr.json",
+    #"scalar_array_dset.json",
     "tall.json",
     "tall_with_udlink.json",
     "tgroup.json",

test/integ/jsontoh5_test.py

@@ -526,6 +526,17 @@ def testReadNullSpaceDataset(self):
             shape_item = db.getShapeItemByDsetObj(obj)
             self.assertTrue('class' in shape_item)
             self.assertEqual(shape_item['class'], 'H5S_NULL')
+
+    def testReadScalarSpaceArrayDataset(self):
+        filepath = getFile('scalar_array_dset.h5', 'readscalarspacearraydataset.h5')
+         
+        with Hdf5db(filepath, app_logger=self.log) as db:
+            dsetUuid = db.getUUIDByPath('/DS1')
+            self.assertEqual(len(dsetUuid), UUID_LEN)
+            obj = db.getDatasetObjByUuid(dsetUuid)
+            shape_item = db.getShapeItemByDsetObj(obj)
+            self.assertTrue('class' in shape_item)
+            self.assertEqual(shape_item['class'], 'H5S_SCALAR')
 
     def testReadNullSpaceAttribute(self):
         filepath = getFile('null_space_attr.h5', 'readnullspaceattr.h5')