[svn-r7842] Purpose:
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
This commit is contained in:
55
tools/testfiles/tvldtypes4.h5.xml
Normal file
55
tools/testfiles/tvldtypes4.h5.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
#############################
|
||||
Expected output for 'h5dump --xml tvldtypes4.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: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>
|
||||
<!-- VL fill 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:VLType>
|
||||
<hdf5:DataType>
|
||||
<hdf5:CompoundType>
|
||||
<hdf5:Field FieldName="i">
|
||||
<hdf5:DataType>
|
||||
<hdf5:AtomicType>
|
||||
<hdf5:IntegerType ByteOrder="LE" Sign="true" Size="4" />
|
||||
</hdf5:AtomicType>
|
||||
</hdf5:DataType>
|
||||
</hdf5:Field>
|
||||
<hdf5:Field FieldName="f">
|
||||
<hdf5:DataType>
|
||||
<hdf5:AtomicType>
|
||||
<hdf5:FloatType ByteOrder="LE" Size="4" SignBitLocation="31" ExponentBits="8" ExponentLocation="23" MantissaBits="23" MantissaLocation="0" />
|
||||
</hdf5:AtomicType>
|
||||
</hdf5:DataType>
|
||||
</hdf5:Field>
|
||||
</hdf5:CompoundType>
|
||||
</hdf5:DataType>
|
||||
</hdf5:VLType>
|
||||
</hdf5:DataType>
|
||||
<!-- Note: format of VL data not specified -->
|
||||
<hdf5:Data>
|
||||
<hdf5:DataFromFile>
|
||||
0 0 10 6.66667 11 7 20 13.3333 21 13.6667 22 14
|
||||
30 20 31 20.3333 32 20.6667 33 21
|
||||
</hdf5:DataFromFile>
|
||||
</hdf5:Data>
|
||||
</hdf5:Dataset>
|
||||
</hdf5:RootGroup>
|
||||
</hdf5:HDF5-File>
|
||||
Reference in New Issue
Block a user