mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r12518] h5dump binary output:

Browse Source 
1. changed the -F flag option names to "BE and "LE" for big and little endian 
2. added a more verbose usage message for these options
3. add a new test
4. add a make clean instruction  to *.bin
This commit is contained in:
Pedro Vicente Nunes 2006-07-31 11:04:31 -05:00
parent 87449d081d
commit 70b46a1d89
10 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MANIFEST
View File

@ -1089,9 +1089,10 @@
./tools/testfiles/tvms.ddl
./tools/testfiles/tldouble.h5
./tools/testfiles/tvms.h5
./tools/testfiles/tbin.ddl
./tools/testfiles/tbin1.ddl
./tools/testfiles/tbin2.ddl
./tools/testfiles/tbin3.ddl
./tools/testfiles/tbin4.ddl
# Expected output from h5ls tests

2
tools/h5dump/Makefile.am
View File

@ -38,7 +38,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
# Temporary files. *.h5 are generated by h5dumpgentest. They should
# copied to the testfiles/ directory if update is required.
CHECK_CLEANFILES+=*.h5
CHECK_CLEANFILES+=*.h5 *.bin
DISTCLEANFILES=testh5dump.sh
include $(top_srcdir)/config/conclude.am

2
tools/h5dump/Makefile.in
View File

@ -335,7 +335,7 @@ TRACE = perl $(top_srcdir)/bin/trace
# Temporary files. *.h5 are generated by h5dumpgentest. They should
# copied to the testfiles/ directory if update is required.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin
# Include files in /src directory and /tools/lib directory
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib

9
tools/h5dump/h5dump.c
View File

@ -598,7 +598,10 @@ usage(const char *prog)
fprintf(stdout, " -l P, --soft-link=P Print the value(s) of the specified soft link\n");
fprintf(stdout, " -o F, --output=F Output raw data into file F\n");
fprintf(stdout, " -b F Output raw data into file F in binary form (use with -d)\n");
fprintf(stdout, " -F T Form of binary output (T can be NA for native type, DI for the disk file type, LI or BI for pre-existing little or big endian types)\n");
fprintf(stdout, " -F T Form of binary output (T can be NA for native type,\n");
fprintf(stdout, " DI for the disk file type, LE or BE for pre-existing little or big endian types)\n");
fprintf(stdout, " E.g., to dump a dataset called 'integer' in a file called `test1.h5', use\n");
fprintf(stdout, " h5dump -b bin.out -F LE -d integer test1.h5\n");
fprintf(stdout, " -t P, --datatype=P Print the specified named data type\n");
fprintf(stdout, " -w N, --width=N Set the number of columns of output\n");
fprintf(stdout, " -x, --xml Output in XML using Schema\n");
@ -2725,9 +2728,9 @@ set_binary_form(const char *form)
bform = 0;
else if (strcmp(form,"DI")==0) /* file type form */
bform = 1;
else if (strcmp(form,"LI")==0) /* convert to little endian */
else if (strcmp(form,"LE")==0) /* convert to little endian */
bform = 2;
else if (strcmp(form,"BI")==0) /* convert to big endian */
else if (strcmp(form,"BE")==0) /* convert to big endian */
bform = 3;

5
tools/h5dump/testh5dump.sh.in
View File

@ -321,9 +321,10 @@ TOOLTEST tlonglinks.ddl tlonglinks.h5
TOOLTEST tvms.ddl tvms.h5
# test for binary output
TOOLTEST tbin.ddl -d integer -b out.bin test1.h5
TOOLTEST tbin1.ddl -d integer -b out1.bin test1.h5
TOOLTEST tbin2.ddl -d integer -b out2.bin -F DI test1.h5
TOOLTEST tbin3.ddl -d integer -b out3.bin -F LI test1.h5
TOOLTEST tbin3.ddl -d integer -b out3.bin -F LE test1.h5
TOOLTEST tbin4.ddl -d integer -b out4.bin -F BE test1.h5
if test $nerrors -eq 0 ; then
echo "All $DUMPER tests passed."

1
tools/lib/h5tools.c
View File

@ -1736,7 +1736,6 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem)
}
else
{
/* all other types get printed as hexadecimal */
size_t i;
if (1==size)
{

2
tools/testfiles/tbin.ddl → tools/testfiles/tbin1.ddl
View File

@ -1,5 +1,5 @@
#############################
Expected output for 'h5dump -d integer -b out.bin test1.h5'
Expected output for 'h5dump -d integer -b out1.bin test1.h5'
#############################
HDF5 "test1.h5" {
DATASET "integer" {

2
tools/testfiles/tbin3.ddl
View File

@ -1,5 +1,5 @@
#############################
Expected output for 'h5dump -d integer -b out3.bin -F LI test1.h5'
Expected output for 'h5dump -d integer -b out3.bin -F LE test1.h5'
#############################
HDF5 "test1.h5" {
DATASET "integer" {

11
tools/testfiles/tbin4.ddl Normal file
View File

@ -0,0 +1,11 @@
#############################
Expected output for 'h5dump -d integer -b out4.bin -F BE test1.h5'
#############################
HDF5 "test1.h5" {
DATASET "integer" {
DATATYPE H5T_STD_I32LE
DATASPACE SIMPLE { ( 2 ) / ( 2 ) }
DATA {
}
}
}

5
tools/testfiles/tnofilename.ddl
View File

@ -21,7 +21,10 @@ usage: h5dump [OPTIONS] file
-l P, --soft-link=P Print the value(s) of the specified soft link
-o F, --output=F Output raw data into file F
-b F Output raw data into file F in binary form (use with -d)
-F T Form of binary output (T can be NA for native type, DI for the disk file type, LI or BI for pre-existing little or big endian types)
-F T Form of binary output (T can be NA for native type,
DI for the disk file type, LE or BE for pre-existing little or big endian types)
E.g., to dump a dataset called 'integer' in a file called `test1.h5', use
h5dump -b bin.out -F LE -d integer test1.h5
-t P, --datatype=P Print the specified named data type
-w N, --width=N Set the number of columns of output
-x, --xml Output in XML using Schema