[svn-r6099]

Purpose:
    bug fix.
Description:
    h5dump cannot dump data and datatype for VL string.
Platforms tested:
    eirene, arabica
Misc. update:
    MANIFEST, RELEASE.txt

3 files changed, 92 insertions, 0 deletions

diff --git a/tools/testfiles/tvlstr.ddl b/tools/testfiles/tvlstr.ddl
new file mode 100644
index 0000000..93b392e
--- /dev/null
+++ b/tools/testfiles/tvlstr.ddl
@@ -0,0 +1,41 @@
+#############################
+Expected output for 'h5dump tvlstr.h5'
+#############################
+HDF5 "tvlstr.h5" {
+GROUP "/" {
+   ATTRIBUTE "test_scalar" {
+      DATATYPE  H5T_STRING {
+            STRSIZE H5T_VARIABLE;
+            STRPAD H5T_STR_NULLPAD;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SCALAR  
+      DATA {
+         "This is the string for the attribute"
+      } 
+   } 
+   DATASET "Dataset1" {
+      DATATYPE  H5T_STRING {
+            STRSIZE H5T_VARIABLE;
+            STRPAD H5T_STR_NULLTERM;
+            CSET H5T_CSET_ASCII;
+            CTYPE H5T_C_S1;
+         }        
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+      DATA {
+         "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.",
+         "Now we are engaged in a great civil war,",
+         "testing whether that nation or any nation so conceived and so dedicated can long endure."
+      } 
+   } 
+   DATATYPE "vl_string_type"       H5T_STRING {
+         STRSIZE H5T_VARIABLE;
+         STRPAD H5T_STR_NULLPAD;
+         CSET H5T_CSET_ASCII;
+         CTYPE H5T_C_S1;
+      };
+    
+} 
+} 
diff --git a/tools/testfiles/tvlstr.h5 b/tools/testfiles/tvlstr.h5
new file mode 100644
index 0000000..53f34ef
--- /dev/null
+++ b/tools/testfiles/tvlstr.h5
diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/testfiles/tvlstr.h5.xml
new file mode 100644
index 0000000..3e5b07e
--- /dev/null
+++ b/tools/testfiles/tvlstr.h5.xml
@@ -0,0 +1,51 @@
+#############################
+Expected output for 'h5dump --xml tvlstr.h5'
+#############################
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE HDF5-File PUBLIC "HDF5-File.dtd" "http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.dtd">
+<HDF5-File>
+<RootGroup OBJ-XID="root">
+   <Attribute Name="test_scalar">
+      <Dataspace>
+         <ScalarDataspace />
+      </Dataspace>
+      <DataType> 
+         <AtomicType>
+            <StringType Cset="H5T_CSET_ASCII" StrSize="4" StrPad="H5T_STR_NULLPAD"/>
+         </AtomicType>
+      </DataType>
+      <Data>
+         <DataFromFile>
+         "This is the string for the attribute"
+         </DataFromFile>
+      </Data>
+   </Attribute>
+   <NamedDataType Name="vl_string_type" OBJ-XID="/vl_string_type" Parents="root">
+      <DataType>
+         <AtomicType>
+            <StringType Cset="H5T_CSET_ASCII" StrSize="16" StrPad="H5T_STR_NULLPAD"/>
+         </AtomicType>
+      </DataType>
+   </NamedDataType>
+   <Dataset Name="Dataset1" OBJ-XID="/Dataset1" Parents="root">
+      <Dataspace>
+         <SimpleDataspace Ndims="1">
+            <Dimension  DimSize="4" MaxDimSize="4"/>
+         </SimpleDataspace>
+      </Dataspace>
+      <DataType> 
+         <AtomicType>
+            <StringType Cset="H5T_CSET_ASCII" StrSize="4" StrPad="H5T_STR_NULLTERM"/>
+         </AtomicType>
+      </DataType>
+      <Data>
+         <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."
+         "Now we are engaged in a great civil war,"
+         "testing whether that nation or any nation so conceived and so dedicated can long endure."
+         </DataFromFile>
+      </Data>
+   </Dataset>
+</RootGroup>
+</HDF5-File>