mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-24 17:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14168] bug fix:

Browse Source 
groups and creation order:
if there is a request to do H5_INDEX_CRT_ORDER and this flag is set
in the group, then, sort by creation order, otherwise by name

tested: windows, linux
This commit is contained in:
Pedro Vicente Nunes 2007-10-02 09:54:38 -05:00
parent c36d2e6e25
commit 5c081f2baa
1 changed files with 31 additions and 37 deletions

68
tools/h5dump/h5dump.c

@ -1431,26 +1431,24 @@ dump_all(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED *op
}
/* Iterate into group */
/* if there is a request to do H5_INDEX_CRT_ORDER and this flag is set
in the group, then, sort by creation order, otherwise by name */
#if 0
if( (crt_order_flags == H5P_CRT_ORDER_TRACKED ) ||
(crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
if( (sort_by == H5_INDEX_CRT_ORDER) &&
(crt_order_flags == H5P_CRT_ORDER_TRACKED ||
crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
{
dump_function_table->dump_group_function(obj, name, H5_INDEX_CRT_ORDER );
dump_function_table->dump_group_function(obj, name, sort_by, sort_order);
}
else
{
dump_function_table->dump_group_function(obj, name, H5_INDEX_NAME );
dump_function_table->dump_group_function(obj, name, H5_INDEX_NAME, sort_order);
}
#endif
dump_function_table->dump_group_function(obj, name, sort_by, sort_order);
if(H5Pclose(gcpl_id) < 0)
d_status = EXIT_FAILURE;
@ -3254,24 +3252,21 @@ handle_groups(hid_t fid, char *group, void UNUSED * data)
d_status = EXIT_FAILURE;
}
/* if there is a request to do H5_INDEX_CRT_ORDER and this flag is set
in the group, then, sort by creation order, otherwise by name */
#if 0
if( (crt_order_flags == H5P_CRT_ORDER_TRACKED ) ||
(crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
if( (sort_by == H5_INDEX_CRT_ORDER) &&
(crt_order_flags == H5P_CRT_ORDER_TRACKED ||
crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
{
dump_group(gid, group, H5_INDEX_CRT_ORDER );
dump_group(gid, group, sort_by, sort_order );
}
else
{
dump_group(gid, group, H5_INDEX_NAME );
dump_group(gid, group, H5_INDEX_NAME, sort_order );
}
#endif
dump_group(gid, group, sort_by, sort_order );
if(H5Pclose(gcpl_id) < 0)
d_status = EXIT_FAILURE;
@ -4016,25 +4011,24 @@ main(int argc, const char *argv[])
d_status = EXIT_FAILURE;
}
#if 0
if( (crt_order_flags == H5P_CRT_ORDER_TRACKED ) ||
(crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
/* if there is a request to do H5_INDEX_CRT_ORDER and this flag is set
in the group, then, sort by creation order, otherwise by name */
if( (sort_by == H5_INDEX_CRT_ORDER) &&
(crt_order_flags == H5P_CRT_ORDER_TRACKED ||
crt_order_flags == (H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED)))
{
dump_function_table->dump_group_function(gid, "/", H5_INDEX_CRT_ORDER );
dump_function_table->dump_group_function(gid, "/", sort_by, sort_order );
}
else
{
dump_function_table->dump_group_function(gid, "/", H5_INDEX_NAME );
dump_function_table->dump_group_function(gid, "/", H5_INDEX_NAME, sort_order );
}
#endif
dump_function_table->dump_group_function(gid, "/", sort_by, sort_order );
}
if(H5Gclose(gid) < 0)