[svn-r22052] - h5dump: Added capability for "-a" option to show attributes containing "/"

               by using an escape character. For example, for a dataset "/dset" 
               containing attribute "speed(m/h)", use "h5dump -a "/dset/speed(\/h)" 
               to show the content of the attribute. See details at HDFFV-7523

6 files changed, 7 insertions, 7 deletions

diff --git a/tools/testfiles/tarray6.h5 b/tools/testfiles/tarray6.h5
index b4af19b..7eb078c 100644
--- a/tools/testfiles/tarray6.h5
+++ b/tools/testfiles/tarray6.h5
diff --git a/tools/testfiles/tattr-1.ddl b/tools/testfiles/tattr-1.ddl
index d353577..b58731b 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/testfiles/tattr-1.ddl
@@ -1,6 +1,6 @@
 HDF5 "tattr.h5" {
 GROUP "/" {
-   ATTRIBUTE "attr1" {
+   ATTRIBUTE "/attr1" {
       DATATYPE  H5T_STD_I8BE
       DATASPACE  SIMPLE { ( 24 ) / ( 24 ) }
       DATA {
diff --git a/tools/testfiles/tattr-2.ddl b/tools/testfiles/tattr-2.ddl
index 79ba8c3..328b54f 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/testfiles/tattr-2.ddl
@@ -7,14 +7,14 @@ ATTRIBUTE "/attr1" {
    (14): 111, 111, 116, 32, 103, 114, 111, 117, 112, 0
    }
 }
-ATTRIBUTE "/attr4" {
+ATTRIBUTE "attr4" {
    DATATYPE  H5T_STD_I32BE
    DATASPACE  SCALAR
    DATA {
    (0): 100
    }
 }
-ATTRIBUTE "/attr5" {
+ATTRIBUTE "attr5" {
    DATATYPE  H5T_STRING {
       STRSIZE 17;
       STRPAD H5T_STR_NULLTERM;
diff --git a/tools/testfiles/tattr-3.ddl b/tools/testfiles/tattr-3.ddl
index c0dd123..a19f69a 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/testfiles/tattr-3.ddl
@@ -1,9 +1,9 @@
 HDF5 "tattr.h5" {
-ATTRIBUTE "/attr2" {
+ATTRIBUTE "attr2" {
    DATATYPE  H5T_STD_I32BE
    DATASPACE  SIMPLE { ( 10 ) / ( 10 ) }
 }
-ATTRIBUTE "/attr" {
+ATTRIBUTE "attr" {
 }
 }
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
@@ -13,4 +13,4 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5O_attr_open_by_name(): can't locate attribute: 'attr'
     major: Attribute
     minor: Object not found
-h5dump error: unable to open attribute "/attr"
+h5dump error: unable to open attribute "attr"
diff --git a/tools/testfiles/tattr.h5 b/tools/testfiles/tattr.h5
index fd14b58..d61def5 100644
--- a/tools/testfiles/tattr.h5
+++ b/tools/testfiles/tattr.h5
diff --git a/tools/testfiles/tattr.h5.xml b/tools/testfiles/tattr.h5.xml
index 57fa276..fceea99 100644
--- a/tools/testfiles/tattr.h5.xml
+++ b/tools/testfiles/tattr.h5.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_928" H5Path="/">
-   <hdf5:Attribute Name="attr1">
+   <hdf5:Attribute Name="/attr1">
       <hdf5:Dataspace>
          <hdf5:SimpleDataspace Ndims="1">
             <hdf5:Dimension  DimSize="24" MaxDimSize="24"/>