added support for boolean types

Author: jreadey

data/json/bool_attr.json

@@ -0,0 +1,39 @@
+{
+    "apiVersion": "1.1.0",
+    "groups": {
+        "a58ed768-0370-11e7-926f-3c15c2da029e": {
+            "alias": [
+                "/"
+            ],
+            "attributes": [
+                {
+                    "name": "attr1",
+                    "shape": {
+                        "class": "H5S_SIMPLE",
+                        "dims": [
+                            4
+                        ]
+                    },
+                    "type": {
+                        "base": {
+                            "base": "H5T_STD_I8LE",
+                            "class": "H5T_INTEGER"
+                        },
+                        "class": "H5T_ENUM",
+                        "mapping": {
+                            "FALSE": 0,
+                            "TRUE": 1
+                        }
+                    },
+                    "value": [
+                        false,
+                        true,
+                        false,
+                        true
+                    ]
+                }
+            ]
+        }
+    },
+    "root": "a58ed768-0370-11e7-926f-3c15c2da029e"
+}

data/json/bool_dset.json

@@ -0,0 +1,56 @@
+{
+    "apiVersion": "1.1.0",
+    "datasets": {
+        "b59c0308-0370-11e7-a673-3c15c2da029e": {
+            "alias": [
+                "/DS1"
+            ],
+            "creationProperties": {
+                "allocTime": "H5D_ALLOC_TIME_LATE",
+                "fillTime": "H5D_FILL_TIME_IFSET",
+                "layout": {
+                    "class": "H5D_CONTIGUOUS"
+                }
+            },
+            "shape": {
+                "class": "H5S_SIMPLE",
+                "dims": [
+                    4
+                ]
+            },
+            "type": {
+                "base": {
+                    "base": "H5T_STD_I8LE",
+                    "class": "H5T_INTEGER"
+                },
+                "class": "H5T_ENUM",
+                "mapping": {
+                    "FALSE": 0,
+                    "TRUE": 1
+                }
+            },
+            "value": [
+                false,
+                true,
+                false,
+                true
+            ]
+        }
+    },
+    "groups": {
+        "b59a29f0-0370-11e7-86c9-3c15c2da029e": {
+            "alias": [
+                "/"
+            ],
+            "links": [
+                {
+                    "class": "H5L_TYPE_HARD",
+                    "collection": "datasets",
+                    "id": "b59c0308-0370-11e7-a673-3c15c2da029e",
+                    "title": "DS1"
+                }
+            ]
+        }
+    },
+    "root": "b59a29f0-0370-11e7-86c9-3c15c2da029e"
+}

h5json/hdf5db.py

@@ -1029,7 +1029,6 @@ def createTypeFromItem(self, attr_type):
                 raise IOError(errno.ENXIO, msg)
             dt = tgt  # can use the object as the dt parameter
         else:
-
             try:
                 dt = createDataType(attr_type)
             except KeyError as ke:

h5json/hdf5dtype.py

@@ -266,12 +266,21 @@ def getTypeItem(dt):
 
     elif dt.kind == 'b':
         # boolean type - h5py stores as enum
-        if dt.base == dt:
-            raise TypeError("Expected base type to be different than parent")
-        baseType = getBaseType(dt)
+        # assume LE unless the numpy byteorder is '>'
+        byteorder = 'LE'
+        if dt.base.byteorder == '>':
+            byteorder = 'BE'
+        # this mapping is an h5py convention for boolean support
+        mapping =  {
+            "FALSE": 0,
+            "TRUE": 1
+        }      
         type_info['class'] = 'H5T_ENUM'
-        type_info['mapping'] = {"false": 0, "true": 1}
-        type_info['base'] = getTypeItem(dt.base)
+        type_info['mapping'] = mapping
+        base_info = { "class": "H5T_INTEGER" }
+        base_info['base'] = "H5T_STD_I8" + byteorder
+        type_info["base"] = base_info
+
     elif dt.kind == 'f':
         # floating point type
         type_info['class'] = 'H5T_FLOAT'
@@ -525,6 +534,22 @@ def createDataType(typeItem):
             subtypes.append((field['name'], dt))  # append tuple
 
         dtRet = np.dtype(subtypes)
+    elif typeClass == 'H5T_ENUM':
+        if 'base' not in typeItem:
+            raise KeyError("Expected 'base' to be provided for enum type")
+        base_json = typeItem["base"]
+        if 'class' not in base_json:
+            raise KeyError("Expected class field in base type")
+        if base_json['class'] != 'H5T_INTEGER':
+            raise TypeError("Only integer base types can be used with enum type")
+        if 'mapping' not in typeItem:
+            raise KeyError("'mapping' not provided for enum type")
+        mapping = typeItem["mapping"]
+        if len(mapping) == 0:
+            raise KeyError("empty enum map")
+        dt = createBaseDataType(base_json)
+        dtRet = special_dtype(enum=(dt, mapping))
+        
     else:
         dtRet = createBaseDataType(typeItem)  # create non-compound dt
     return dtRet

test/integ/h5tojson_test.py

@@ -32,6 +32,8 @@
     # bitfields not supported yet
     # "bitfield_attr.h5",
     # "bitfield_dset.h5",
+    "bool_attr.h5",
+    "bool_dset.h5",
     "committed_type.h5",
     "compound.h5",
     "compound_array.h5",

test/integ/jsontoh5_test.py

@@ -31,6 +31,8 @@
     # bitfields not supported yet
     # "bitfield_attr.json",
     # "bitfield_dset.json",
+    "bool_attr.json",
+    "bool_dset.json",
     "committed_type.json",
     "compound.json",
     # "compound_array.json",
@@ -44,8 +46,8 @@
     "dset_creationprop.json",
     # "dset_gzip.json",
     "empty.json",
-    # "enum_attr.json",
-    # "enum_dset.json",
+    "enum_attr.json",
+    "enum_dset.json",
     "fillvalue.json",
     "h5ex_d_alloc.json",
     "h5ex_d_checksum.json",