mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
e1792ebb22
Bug fix
Description:
Variable length strings and sequences with NULL pointers were not handled
by library, causing problems access the data. This also affected fill values
for variable-length datatypes.
Solution:
Address the issues in the library by detecting NULL sequences/strings
and avoid trying to convert them.
Patched up dumper to display NULL sequences/strings.
Platforms tested:
FreeBSD 4.9 (sleipnir)
h5committest
58 lines
2.3 KiB
XML
58 lines
2.3 KiB
XML
#############################
|
|
Expected output for 'h5dump --xml tvlstr.h5'
|
|
#############################
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
|
|
<hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
|
|
<hdf5:Attribute Name="test_scalar">
|
|
<hdf5:Dataspace>
|
|
<hdf5:ScalarDataspace />
|
|
</hdf5:Dataspace>
|
|
<hdf5:NamedDataTypePtr OBJ-XID="xid_1576" H5Path="/vl_string_type" />
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
"This is the string for the attribute"
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Attribute>
|
|
<hdf5:NamedDataType Name="vl_string_type" OBJ-XID="xid_1576" H5Path="/vl_string_type" Parents="xid_928" H5ParentPaths="/">
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLPAD"/>
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
</hdf5:NamedDataType>
|
|
<hdf5:Dataset Name="Dataset1" OBJ-XID="xid_976" H5Path= "/Dataset1" Parents="xid_928" H5ParentPaths="/">
|
|
<hdf5:StorageLayout>
|
|
<hdf5:ContiguousLayout/>
|
|
</hdf5:StorageLayout>
|
|
<hdf5:FillValueInfo FillTime="FillOnAlloc" AllocationTime="Late">
|
|
<hdf5:FillValue>
|
|
<hdf5:Data>
|
|
<!-- String fill values not yet implemented. -->
|
|
<hdf5:NoData />
|
|
</hdf5:Data>
|
|
</hdf5:FillValue>
|
|
</hdf5:FillValueInfo>
|
|
<hdf5:Dataspace>
|
|
<hdf5:SimpleDataspace Ndims="1">
|
|
<hdf5:Dimension DimSize="4" MaxDimSize="4"/>
|
|
</hdf5:SimpleDataspace>
|
|
</hdf5:Dataspace>
|
|
<hdf5:DataType>
|
|
<hdf5:AtomicType>
|
|
<hdf5:StringType Cset="H5T_CSET_ASCII" StrSize="H5T_VARIABLE" StrPad="H5T_STR_NULLTERM"/>
|
|
</hdf5:AtomicType>
|
|
</hdf5:DataType>
|
|
<hdf5:Data>
|
|
<hdf5:DataFromFile>
|
|
"Four score and seven years ago our forefathers brought forth on this continent a new nation,"
|
|
"conceived in liberty and dedicated to the proposition that all men are created equal."
|
|
""
|
|
NULL
|
|
</hdf5:DataFromFile>
|
|
</hdf5:Data>
|
|
</hdf5:Dataset>
|
|
</hdf5:RootGroup>
|
|
</hdf5:HDF5-File>
|