summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2000-12-13 02:15:31 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2000-12-13 02:15:31 (GMT)
commit9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066 (patch)
treebdabb7f53c51b873b76b0d55e4548af592fb357d /c++/src
parentb72e8ae6b9d9476e8060a9a8f0e0c8058db2591b (diff)
downloadhdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.zip
hdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.tar.gz
hdf5-9cbeb3c53f0d34d8e2b7cca0fbaab8ec55179066.tar.bz2
[svn-r3121] Purpose:
Fix and improve Description: - Put functions that are common to H5File and Group into a prototype class, CommonFG. I didn't do that before because of the fear of the consequences of multiple inheritance, since H5File and Group already inherit from different super classes. I recently read a C++ book and learned to use MI more safely. This change reduced some more of code redundancy. - Added missing const to some function parameters - Added missing return statements for some functions. Platforms tested: Solaris/CC 5.0 (arabica)
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/H5CommonFG.cpp335
-rw-r--r--c++/src/H5DataSet.cpp2
-rw-r--r--c++/src/H5File.cpp328
-rw-r--r--c++/src/H5Group.cpp343
-rw-r--r--c++/src/H5IdComponent.cpp2
5 files changed, 272 insertions, 738 deletions
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp
index 6ece682..02dad70 100644
--- a/c++/src/H5CommonFG.cpp
+++ b/c++/src/H5CommonFG.cpp
@@ -10,6 +10,7 @@
#include "H5FcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
+#include "H5CommonFG.h"
#include "H5Group.h"
#include "H5AbstractDs.h"
#include "H5DataSpace.h"
@@ -17,33 +18,34 @@
#include "H5File.h"
#include "H5Alltypes.h"
-// Since several compilers do not have support template functions, the
-// code in H5templates.h are modified to become the common code defined
-// in this file. The common functions use the hdf5 id that is provided
-// by the appropriate objects.
-// October 2000
-
// There are a few comments that are common to most of the functions
// defined in this file so they are listed here.
-// - when a failure returned by the C API, the functions will
-// throw an exception, called File_GroupException, so Group or File can
-// catch it and throw the appropriate exception to the user's application,
-// i.e., GroupInterfaceException or FileInterfaceException.
-// June 2000
+// - getLocId is called by all functions, that call a C API, to get
+// the location id, which can be either a file id or a group id.
+// This function is pure virtual and it's up to H5File and Group
+// to call the right getId() - although, as the structure of the
+// library at this time, getId() is basically the IdComponent::getId()
+// - when a failure returned by the C API, the functions will call
+// throwException, which is a pure virtual function and is implemented
+// by H5File to throw a FileIException and by Group to throw a
+// GroupIException.
+// December 2000
#ifndef H5_NO_NAMESPACE
namespace H5 {
#endif
+
// Creates a new group at this location which can be a file or another group.
-Group createGroupT( const hid_t loc_id, const string name, size_t size_hint )
+Group CommonFG::createGroup( const string& name, size_t size_hint ) const
{
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
+ return( createGroup( name.c_str(), size_hint ));
+}
+Group CommonFG::createGroup( const char* name, size_t size_hint ) const
+{
// Call C routine H5Gcreate to create the named group, giving the
// location id which can be a file id or a group id
- hid_t group_id = H5Gcreate( loc_id, name_C, size_hint );
+ hid_t group_id = H5Gcreate( getLocId(), name, size_hint );
// If the group id is valid, create and return the Group object
if( group_id > 0 )
@@ -53,20 +55,21 @@ Group createGroupT( const hid_t loc_id, const string name, size_t size_hint )
}
else
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Opens an existing group in a location which can be a file or another group
-Group openGroupT( const hid_t loc_id, const string name )
+Group CommonFG::openGroup( const string& name ) const
+{
+ return( openGroup( name.c_str() ));
+}
+Group CommonFG::openGroup( const char* name ) const
{
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
// Call C routine H5Gopen to open the named group, giving the
// location id which can be a file id or a group id
- hid_t group_id = H5Gopen( loc_id, name_C );
+ hid_t group_id = H5Gopen( getLocId(), name );
// If the group id is valid, create and return the Group object
if( group_id > 0 )
@@ -76,24 +79,25 @@ Group openGroupT( const hid_t loc_id, const string name )
}
else
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Creates a new dataset at this location.
-DataSet createDataSetT( const hid_t loc_id, const string name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist )
+DataSet CommonFG::createDataSet( const string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
+{
+ return( createDataSet( name.c_str(), data_type, data_space, create_plist ));
+}
+DataSet CommonFG::createDataSet( const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
{
- // Convert the dataset's name in C++ string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
// Obtain identifiers for C API
hid_t type_id = data_type.getId();
hid_t space_id = data_space.getId();
hid_t create_plist_id = create_plist.getId();
// Call C routine H5Dcreate to create the named dataset
- hid_t dataset_id = H5Dcreate( loc_id, name_C, type_id, space_id, create_plist_id );
+ hid_t dataset_id = H5Dcreate( getLocId(), name, type_id, space_id, create_plist_id );
// If the dataset id is valid, create and return the DataSet object
if( dataset_id > 0 )
@@ -103,20 +107,21 @@ DataSet createDataSetT( const hid_t loc_id, const string name, const DataType& d
}
else
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Opens an existing dataset at this location.
-DataSet openDataSetT( const hid_t loc_id, const string name )
+DataSet CommonFG::openDataSet( const string& name ) const
+{
+ return( openDataSet( name.c_str() ));
+}
+DataSet CommonFG::openDataSet( const char* name ) const
{
- // Convert the dataset's name in C++ string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
// Call C function H5Dopen to open the specified dataset, giving
// the location id and the dataset's name
- hid_t dataset_id = H5Dopen( loc_id, name_C );
+ hid_t dataset_id = H5Dopen( getLocId(), name );
// If the dataset id is valid, create and return the DataSet object
if( dataset_id > 0 )
@@ -126,82 +131,86 @@ DataSet openDataSetT( const hid_t loc_id, const string name )
}
else
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Creates a link of the specified type from new_name to current_name;
// both names are interpreted relative to the specified location id
-void linkT( const hid_t loc_id, H5G_link_t link_type, const string curr_name, const string new_name )
+void CommonFG::link( H5G_link_t link_type, const string& curr_name, const string& new_name ) const
{
- // Convert string to C-string
- const char* curr_name_C, *new_name_C;
- curr_name_C = curr_name.c_str(); // refers to contents of curr_name as a C-str
- new_name_C = new_name.c_str(); // refers to contents of new_name as a C-str
-
- herr_t ret_value = H5Glink( loc_id, link_type, curr_name_C, new_name_C );
+ link( link_type, curr_name.c_str(), new_name.c_str() );
+}
+void CommonFG::link( H5G_link_t link_type, const char* curr_name, const char* new_name ) const
+{
+ herr_t ret_value = H5Glink( getLocId(), link_type, curr_name, new_name );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Removes the specified name at this location.
-void unlinkT( const hid_t loc_id, const string name )
+void CommonFG::unlink( const string& name ) const
{
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
- herr_t ret_value = H5Gunlink( loc_id, name_C );
+ unlink( name.c_str() );
+}
+void CommonFG::unlink( const char* name ) const
+{
+ herr_t ret_value = H5Gunlink( getLocId(), name );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Renames an object at this location.
-void moveT( const hid_t loc_id, const string src, const string dst )
+void CommonFG::move( const string& src, const string& dst ) const
{
- // Convert string to C-string
- const char* src_C, *dst_C;
- src_C = src.c_str(); // refers to contents of src as a C-str
- dst_C = dst.c_str(); // refers to contents of dst as a C-str
-
- herr_t ret_value = H5Gmove( loc_id, src_C, dst_C );
+ move( src.c_str(), dst.c_str() );
+}
+void CommonFG::move( const char* src, const char* dst ) const
+{
+ herr_t ret_value = H5Gmove( getLocId(), src, dst );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Returns information about an object
-void getObjinfoT( const hid_t loc_id, const string name, hbool_t follow_link, H5G_stat_t& statbuf )
+void CommonFG::getObjinfo( const string& name, hbool_t follow_link, H5G_stat_t& statbuf ) const
{
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
- herr_t ret_value = H5Gget_objinfo( loc_id, name_C, follow_link, &statbuf );
+ getObjinfo( name.c_str(), follow_link, statbuf );
+}
+void CommonFG::getObjinfo( const char* name, hbool_t follow_link, H5G_stat_t& statbuf ) const
+{
+ herr_t ret_value = H5Gget_objinfo( getLocId(), name, follow_link, &statbuf );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Returns the name of the object that the symbolic link points to.
-string getLinkvalT( const hid_t loc_id, const string name, size_t size )
+string CommonFG::getLinkval( const string& name, size_t size ) const
+{
+ return( getLinkval( name.c_str(), size ));
+}
+string CommonFG::getLinkval( const char* name, size_t size ) const
{
- // Convert string to C-string - name_C refers to the contents of name
- // as a C string
- const char* name_C = name.c_str();
-
char* value_C = new char[size+1]; // temporary C-string for C API
- herr_t ret_value = H5Gget_linkval( loc_id, name_C, size, value_C );
+ herr_t ret_value = H5Gget_linkval( getLocId(), name, size, value_C );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
string value = string( value_C );
delete value_C;
@@ -209,35 +218,37 @@ string getLinkvalT( const hid_t loc_id, const string name, size_t size )
}
// Sets the comment for an object specified by its name
-void setCommentT( const hid_t loc_id, const string name, const string comment )
+void CommonFG::setComment( const string& name, const string& comment ) const
{
- // Convert strings to C-strings
- const char* name_C, *comment_C;
- name_C = name.c_str(); // refers to the contents of name as a C-str
- comment_C = comment.c_str(); // refers to the contents of comment as a C-str
- herr_t ret_value = H5Gset_comment( loc_id, name_C, comment_C );
+ setComment( name.c_str(), comment.c_str() );
+}
+void CommonFG::setComment( const char* name, const char* comment ) const
+{
+ herr_t ret_value = H5Gset_comment( getLocId(), name, comment );
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Retrieves comment for specified object
-string getCommentT( const hid_t loc_id, const string name, size_t bufsize )
+string CommonFG::getComment( const string& name, size_t bufsize ) const
+{
+ return( getComment( name.c_str(), bufsize ));
+}
+string CommonFG::getComment( const char* name, size_t bufsize ) const
{
- // Convert string to C-string - name_C refers to the contents of name
- // as a C string
- const char* name_C = name.c_str();
-
// temporary C-string for the object's comment
char* comment_C = new char[bufsize+1];
- herr_t ret_value = H5Gget_comment( loc_id, name_C, bufsize, comment_C );
+ herr_t ret_value = H5Gget_comment( getLocId(), name, bufsize, comment_C );
// if H5Gget_comment returns SUCCEED, return the string comment
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
string comment = string( comment_C );
delete comment_C;
@@ -245,41 +256,159 @@ string getCommentT( const hid_t loc_id, const string name, size_t bufsize )
}
// Mounts the file 'child' onto this group
-void mountT( const hid_t loc_id, const string name, hid_t child_id, PropList& plist )
+void CommonFG::mount( const string& name, H5File& child, PropList& plist ) const
+{
+ mount( name.c_str(), child, plist );
+}
+void CommonFG::mount( const char* name, H5File& child, PropList& plist ) const
{
// Obtain identifiers for C API
hid_t plist_id = plist.getId();
-
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
+ hid_t child_id = child.getId();
// Call C routine H5Fmount to do the mouting
- herr_t ret_value = H5Fmount( loc_id, name_C, child_id, plist_id );
+ herr_t ret_value = H5Fmount( getLocId(), name, child_id, plist_id );
// Raise exception if H5Fmount returns negative value
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
}
}
// Unmounts the file named 'name' from this parent group
-void unmountT( const hid_t loc_id, const string name )
+void CommonFG::unmount( const string& name ) const
+{
+ unmount( name.c_str() );
+}
+void CommonFG::unmount( const char* name ) const
{
- // Convert string to C-string
- const char* name_C;
- name_C = name.c_str(); // name_C refers to the contents of name as a C-str
-
// Call C routine H5Fmount to do the mouting
- herr_t ret_value = H5Funmount( loc_id, name_C );
+ herr_t ret_value = H5Funmount( getLocId(), name );
// Raise exception if H5Funmount returns negative value
if( ret_value < 0 )
{
- throw File_GroupException();
+ //throw File_GroupException();
+ throwException();
+ }
+}
+
+// This private member function calls the C API H5Topen to open the
+// named datatype and returns the datatype's identifier. The function
+// is used by the functions openXxxType's below for opening the sub-types
+hid_t CommonFG::p_openDataType( const char* name ) const
+{
+ // Call C function H5Topen to open the named datatype in this group,
+ // giving the group id
+ hid_t datatype_id = H5Topen( getLocId(), name );
+
+ // If the datatype id is valid, return it, otherwise, throw an exception.
+ if( datatype_id > 0 )
+ return( datatype_id );
+ else
+ {
+ //throw GroupIException();
+ throwException();
+ }
+}
+
+//
+// The following member functions use the private function
+// p_openDataType to open a named datatype in this location
+//
+
+// Opens the named generic datatype in this group.
+DataType CommonFG::openDataType( const string& name ) const
+{
+ return( openDataType( name.c_str()) );
+}
+DataType CommonFG::openDataType( const char* name ) const
+{
+ DataType data_type( p_openDataType( name ));
+ return( data_type );
+}
+
+// Opens the named enumeration datatype in this group.
+EnumType CommonFG::openEnumType( const string& name ) const
+{
+ return( openEnumType( name.c_str()) );
+}
+EnumType CommonFG::openEnumType( const char* name ) const
+{
+ EnumType enum_type( p_openDataType( name ));
+ return( enum_type );
+}
+
+// Opens the named compound datatype in this group.
+CompType CommonFG::openCompType( const string& name ) const
+{
+ return( openCompType( name.c_str()) );
+}
+CompType CommonFG::openCompType( const char* name ) const
+{
+ CompType comp_type( p_openDataType( name ));
+ return( comp_type );
+}
+
+// Opens the named integer datatype in this group.
+IntType CommonFG::openIntType( const string& name ) const
+{
+ return( openIntType( name.c_str()) );
+}
+IntType CommonFG::openIntType( const char* name ) const
+{
+ IntType int_type( p_openDataType( name ));
+ return( int_type );
+}
+
+// Opens the named floating-point datatype in this group.
+FloatType CommonFG::openFloatType( const string& name ) const
+{
+ return( openFloatType( name.c_str()) );
+}
+FloatType CommonFG::openFloatType( const char* name ) const
+{
+ FloatType float_type( p_openDataType( name ));
+ return( float_type );
+}
+
+// Opens the named string datatype of this group
+StrType CommonFG::openStrType( const string& name ) const
+{
+ return( openStrType( name.c_str()) );
+}
+StrType CommonFG::openStrType( const char* name ) const
+{
+ StrType str_type( p_openDataType( name ));
+ return( str_type );
+}
+
+// Iterates a user's function over the entries of a group.
+int CommonFG::iterateElems( const string& name, int *idx, H5G_iterate_t op , void* op_data )
+{
+ return( iterateElems( name.c_str(), idx, op, op_data ));
+}
+int CommonFG::iterateElems( const char* name, int *idx, H5G_iterate_t op , void* op_data )
+{
+ int ret_value = H5Giterate( getLocId(), name, idx, op, op_data );
+ if( ret_value >= 0 )
+ return( ret_value );
+ else // raise exception when H5Aiterate returns a negative value
+ {
+ throwException();
}
}
+
+CommonFG::CommonFG()
+{ // do nothing
+}
+
+CommonFG::~CommonFG()
+{ // do nothing
+}
+
#ifndef H5_NO_NAMESPACE
}
#endif
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index efdf8a2..aed8d70 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -102,7 +102,7 @@ hsize_t DataSet::getVlenBufSize( DataType& type, DataSpace& space ) const
//{
//throw DataSetIException();
//}
- return(-1);
+ return (-1);
}
// Reclaims VL datatype memory buffers.
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 1ccea96..0498174 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -11,13 +11,13 @@
#include "H5FcreatProp.h"
#include "H5DxferProp.h"
#include "H5DcreatProp.h"
+#include "H5CommonFG.h"
#include "H5Group.h"
#include "H5AbstractDs.h"
#include "H5DataSpace.h"
#include "H5DataSet.h"
#include "H5File.h"
#include "H5Alltypes.h"
-#include "H5CommonFG.h"
#ifndef H5_NO_NAMESPACE
namespace H5 {
@@ -83,6 +83,13 @@ bool H5File::isHdf5(const char* name )
}
}
+// Get id of the location, which id the file id here; used by CommonFG
+// member functions
+hid_t H5File::getLocId() const
+{
+ return( getId() );
+}
+
// Reopens this file
void H5File::reopen()
{
@@ -99,172 +106,6 @@ void H5File::reopen()
}
}
-// Creates a new group in this file using the template function provided
-// in FGtemplates.h
-Group H5File::createGroup( const string& name, size_t size_hint ) const
-{
- return( createGroup( name.c_str(), size_hint ));
-}
-
-Group H5File::createGroup( const char* name, size_t size_hint ) const
-{
- try {
- Group group = createGroupT( id, name, size_hint );
- return( group );
- }
- catch( File_GroupException error )
- {
- throw FileIException();
- }
-}
-
-// Opens an existing group in this file using the template function provided
-// in FGtemplates.h
-Group H5File::openGroup( const string& name ) const
-{
- return( openGroup( name.c_str() ));
-}
-
-Group H5File::openGroup( const char* name ) const
-{
- try {
- Group group = openGroupT( id, name );
- return( group );
- }
- catch( File_GroupException error )
- {
- throw FileIException();
- }
-}
-
-// Creates a dataset in this file using the template function
-// provided in FGtemplates.h
-DataSet H5File::createDataSet( const string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
-{
- return( createDataSet( name.c_str(), data_type, data_space, create_plist ));
-}
-
-DataSet H5File::createDataSet( const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist ) const
-{
- try {
- DataSet dataset = createDataSetT( id, name, data_type, data_space, create_plist );
- return( dataset );
- }
- catch( File_GroupException error )
- {
- throw FileIException();
- }
-}
-
-// Opens an existing dataset in this file using the template function
-// provided in FGtemplates.h
-DataSet H5File::openDataSet( const string& name ) const
-{
- return( openDataSet( name.c_str() ));
-}
-
-DataSet H5File::openDataSet( const char* name ) const
-{
- try {
- DataSet dataset = openDataSetT( id, name );
- return( dataset );
- }
- catch( File_GroupException error )
- {
- throw FileIException();
- }
-}
-
-// This private member function calls the C API H5Topen to open the
-// named datatype in this file, and returns the datatype's identifier.
-// The function is used by the functions openXxxType's below for
-// opening the sub-types
-hid_t H5File::p_openDataType( const char* name ) const
-{
- // Call C function H5Topen to open the named datatype in this group,
- // giving the group id
- hid_t datatype_id = H5Topen( id, name );
-
- // If the datatype id is valid, return it, otherwise, throw an exception.
- if( datatype_id > 0 )
- return( datatype_id );
- else
- {
- throw FileIException();
- }
-}
-
-//
-// The following member functions use the private function
-// p_openDataType to open a named datatype in this group
-//
-
-// Opens the named generic datatype in this group.
-DataType H5File::openDataType( const string& name ) const
-{
- return( openDataType( name.c_str()) );
-}
-DataType H5File::openDataType( const char* name ) const
-{
- DataType data_type( p_openDataType( name ));
- return( data_type );
-}
-
-// Opens the named enumeration datatype in this group.
-EnumType H5File::openEnumType( const string& name ) const
-{
- return( openEnumType( name.c_str()) );
-}
-EnumType H5File::openEnumType( const char* name ) const
-{
- EnumType enum_type( p_openDataType( name ));
- return( enum_type );
-}
-
-// Opens the named compound datatype in this group.
-CompType H5File::openCompType( const string& name ) const
-{
- return( openCompType( name.c_str()) );
-}
-CompType H5File::openCompType( const char* name ) const
-{
- CompType comp_type( p_openDataType( name ));
- return( comp_type );
-}
-
-// Opens the named integer datatype in this group.
-IntType H5File::openIntType( const string& name ) const
-{
- return( openIntType( name.c_str()) );
-}
-IntType H5File::openIntType( const char* name ) const
-{
- IntType int_type( p_openDataType( name ));
- return( int_type );
-}
-
-// Opens the named floating-point datatype in this group.
-FloatType H5File::openFloatType( const string& name ) const
-{
- return( openFloatType( name.c_str()) );
-}
-FloatType H5File::openFloatType( const char* name ) const
-{
- FloatType float_type( p_openDataType( name ));
- return( float_type );
-}
-
-// Opens the named string datatype of this group
-StrType H5File::openStrType( const string& name ) const
-{
- return( openStrType( name.c_str()) );
-}
-StrType H5File::openStrType( const char* name ) const
-{
- StrType str_type( p_openDataType( name ));
- return( str_type );
-}
-
// Returns the creation property list of this file
FileCreatPropList H5File::getCreatePlist() const
{
@@ -301,153 +142,6 @@ FileAccPropList H5File::getAccessPlist() const
}
}
-// Creates a link of the specified type from new_name to current_name;
-// both names are interpreted relative to this file
-void H5File::link( H5G_link_t link_type, const string& curr_name, const string& new_name ) const
-{
- link( link_type, curr_name.c_str(), new_name.c_str() );
-}
-
-void H5File::link( H5G_link_t link_type, const char* curr_name, const char* new_name ) const
-{
- try {
- linkT( id, link_type, curr_name, new_name );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Removes the specified name from this file.
-void H5File::unlink( const string& name ) const
-{
- unlink( name.c_str());
-}
-
-void H5File::unlink( const char* name ) const
-{
- try {
- unlinkT( id, name );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Renames an object from this file.
-void H5File::move( const string& src, const string& dst ) const
-{
- move( src.c_str(), dst.c_str());
-}
-
-void H5File::move( const char* src, const char* dst ) const
-{
- try {
- moveT( id, src, dst );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Returns information about an object
-void H5File::getObjinfo( const string& name, hbool_t follow_link, H5G_stat_t& statbuf ) const
-{
- getObjinfo( name, follow_link, statbuf );
-}
-
-void H5File::getObjinfo( const char* name, hbool_t follow_link, H5G_stat_t& statbuf ) const
-{
- try {
- getObjinfoT( id, name, follow_link, statbuf );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Returns the name of the object that the symbolic link points to.
-string H5File::getLinkval( const string& name, size_t size ) const
-{
- return( getLinkval( name.c_str(), size ));
-}
-
-string H5File::getLinkval( const char* name, size_t size ) const
-{
- try {
- string value = getLinkvalT( id, name, size );
- return( value );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Sets comment for specified object.
-void H5File::setComment( const string& name, const string& comment ) const
-{
- setComment( name.c_str(), comment.c_str());
-}
-
-void H5File::setComment( const char* name, const char* comment ) const
-{
- try {
- setCommentT( id, name, comment );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Retrieves comment for specified object
-string H5File::getComment( const string& name, size_t bufsize ) const
-{
- return( getComment( name.c_str(), bufsize ));
-}
-
-string H5File::getComment( const char* name, size_t bufsize ) const
-{
- try {
- string comment = getCommentT( id, name, bufsize );
- return( comment );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Mounts the file 'child' onto this file
-void H5File::mount( const string& name, H5File& child, PropList& mount_plist ) const
-{
- mount( name.c_str(), child, mount_plist );
-}
-
-void H5File::mount( const char* name, H5File& child, PropList& mount_plist ) const
-{
- try {
- mountT( id, name, child.getId(), mount_plist );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
-// Unmounts the file named 'name' from this parent file
-void H5File::unmount( const string& name ) const
-{
- unmount( name.c_str() );
-}
-
-void H5File::unmount( const char* name ) const
-{
- try {
- unmountT( id, name );
- }
- catch( File_GroupException error ) {
- throw FileIException();
- }
-}
-
// Calls the C API H5Fclose to close this file. Used by IdComponent::reset
void H5File::p_close() const
{
@@ -458,6 +152,12 @@ void H5File::p_close() const
}
}
+// Throw file exception
+void H5File::throwException() const
+{
+ throw FileIException();
+}
+
// The destructor of this instance calls IdComponent::reset to
// reset its identifier - no longer true
// Older compilers (baldric) don't support template member functions
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index b65ba75..c0ae1d3 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -29,332 +29,31 @@ Group::Group() : H5Object() {}
// Copy constructor: makes a copy of the original Group object
Group::Group( const Group& original ) : H5Object( original ) {}
-// Creates a new group in this group using the common function
-// provided in FGtemplates.h.
-Group Group::createGroup( const string& name, size_t size_hint )
+// Get id of the location, which id the group id here; used by CommonFG
+// member functions
+hid_t Group::getLocId() const
{
- return( createGroup( name.c_str(), size_hint ));
-}
-Group Group::createGroup( const char* name, size_t size_hint )
-{
- try {
- Group group = createGroupT( id, name, size_hint );
- return( group );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
+ return( getId() );
}
// Creates a copy of an existing Group using its id
Group::Group( const hid_t group_id ) : H5Object( group_id ) {}
-// Opens an existing group in this group using the common function
-// provided in FGtemplates.h.
-Group Group::openGroup( const string& name )
-{
- return( openGroup( name.c_str() ));
-}
-Group Group::openGroup( const char* name )
-{
- try {
- Group group = openGroupT( id, name );
- return( group );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Creates a dataset in this group using the common function
-// provided in FGtemplates.h
-DataSet Group::createDataSet( const string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist )
-{
- return( createDataSet( name.c_str(), data_type, data_space, create_plist ));
-}
-DataSet Group::createDataSet( const char* name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist )
-{
- try {
- DataSet dataset = createDataSetT( id, name, data_type, data_space, create_plist );
- return( dataset );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Opens a dataset in this group using the common function
-// provided in FGtemplates.h
-DataSet Group::openDataSet( const string& name )
-{
- return( openDataSet( name.c_str() ));
-}
-DataSet Group::openDataSet( const char* name )
-{
- try {
- DataSet dataset = openDataSetT( id, name );
- return( dataset );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// This private member function calls the C API H5Topen to open the
-// named datatype and returns the datatype's identifier. The function
-// is used by the functions openXxxType's below for opening the sub-types
-hid_t Group::p_openDataType( const char* name ) const
-{
- // Call C function H5Topen to open the named datatype in this group,
- // giving the group id
- hid_t datatype_id = H5Topen( id, name );
-
- // If the datatype id is valid, return it, otherwise, throw an exception.
- if( datatype_id > 0 )
- return( datatype_id );
- else
- {
- throw GroupIException();
- }
-}
-
-//
-// The following member functions use the private function
-// p_openDataType to open a named datatype in this group
-//
-
-// Opens the named generic datatype in this group.
-DataType Group::openDataType( const string& name ) const
-{
- return( openDataType( name.c_str()) );
-}
-DataType Group::openDataType( const char* name ) const
-{
- DataType data_type( p_openDataType( name ));
- return( data_type );
-}
-
-// Opens the named enumeration datatype in this group.
-EnumType Group::openEnumType( const string& name ) const
-{
- return( openEnumType( name.c_str()) );
-}
-EnumType Group::openEnumType( const char* name ) const
-{
- EnumType enum_type( p_openDataType( name ));
- return( enum_type );
-}
-
-// Opens the named compound datatype in this group.
-CompType Group::openCompType( const string& name ) const
-{
- return( openCompType( name.c_str()) );
-}
-CompType Group::openCompType( const char* name ) const
-{
- CompType comp_type( p_openDataType( name ));
- return( comp_type );
-}
-
-// Opens the named integer datatype in this group.
-IntType Group::openIntType( const string& name ) const
-{
- return( openIntType( name.c_str()) );
-}
-IntType Group::openIntType( const char* name ) const
-{
- IntType int_type( p_openDataType( name ));
- return( int_type );
-}
-
-// Opens the named floating-point datatype in this group.
-FloatType Group::openFloatType( const string& name ) const
-{
- return( openFloatType( name.c_str()) );
-}
-FloatType Group::openFloatType( const char* name ) const
-{
- FloatType float_type( p_openDataType( name ));
- return( float_type );
-}
-
-// Opens the named string datatype of this group
-StrType Group::openStrType( const string& name ) const
-{
- return( openStrType( name.c_str()) );
-}
-StrType Group::openStrType( const char* name ) const
-{
- StrType str_type( p_openDataType( name ));
- return( str_type );
-}
-
// Iterates a user's function over the entries of a group.
-int Group::iterateElems( const string& name, int *idx, H5G_iterate_t op , void *op_data )
-{
- return( iterateElems( name.c_str(), idx, op, op_data ));
-}
-int Group::iterateElems( const char* name, int *idx, H5G_iterate_t op , void *op_data )
-{
- int ret_value = H5Giterate( id, name, idx, op, op_data );
- if( ret_value >= 0 )
- return( ret_value );
- else // raise exception when H5Aiterate returns a negative value
- {
- throw GroupIException();
- }
-}
-
-// Creates a link of the specified type from new_name to current_name;
-// both names are interpreted relative to this group.
-void Group::link( H5G_link_t link_type, const string& curr_name, const string& new_name )
-{
- link( link_type, curr_name.c_str(), new_name.c_str() );
-}
-void Group::link( H5G_link_t link_type, const char* curr_name, const char* new_name )
-{
- try {
- linkT( id, link_type, curr_name, new_name );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Removes the specified name from this group.
-void Group::unlink( const string& name )
-{
- unlink( name.c_str() );
-}
-void Group::unlink( const char* name )
-{
- try {
- unlinkT( id, name );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Renames an object from this group.
-void Group::move( const string& src, const string& dst )
-{
- move( src.c_str(), dst.c_str() );
-}
-void Group::move( const char* src, const char* dst )
-{
- try {
- moveT( id, src, dst );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Retrieves information about an object.
-void Group::getObjinfo( const string& name, hbool_t follow_link, H5G_stat_t& statbuf )
-{
- getObjinfo( name.c_str(), follow_link, statbuf );
-}
-void Group::getObjinfo( const char* name, hbool_t follow_link, H5G_stat_t& statbuf )
-{
- try {
- getObjinfoT( id, name, follow_link, statbuf );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Returns the name of the object that the symbolic link points to.
-string Group::getLinkval( const string& name, size_t size )
-{
- return( getLinkval( name.c_str(), size ));
-}
-string Group::getLinkval( const char* name, size_t size )
-{
- try {
- string value = getLinkvalT( id, name, size );
- return( value );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Sets comment for an object specified by its name.
-void Group::setComment( const string& name, const string& comment )
-{
- setComment( name.c_str(), comment );
-}
-void Group::setComment( const char* name, const char* comment )
-{
- try {
- setCommentT( id, name, comment );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Retrieves the comment of an object specified by its name
-string Group::getComment( const string& name, size_t bufsize )
-{
- return( getComment( name.c_str(), bufsize ));
-}
-string Group::getComment( const char* name, size_t bufsize )
-{
- try {
- string comment = getCommentT( id, name, bufsize );
- return( comment );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Mounts the file 'child' onto this group.
-void Group::mount( const string& name, H5File& child, PropList& plist )
-{
- mount( name.c_str(), child, plist );
-}
-void Group::mount( const char* name, H5File& child, PropList& plist )
-{
- try {
- mountT( id, name, child.getId(), plist );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
-
-// Unmounts the file named 'name' from this parent group.
-void Group::unmount( const string& name )
-{
- unmount( name.c_str() );
-}
-void Group::unmount( const char* name )
-{
- try {
- unmountT( id, name );
- }
- catch( File_GroupException error )
- {
- throw GroupIException();
- }
-}
+//int Group::iterateElems( const string& name, int *idx, H5G_iterate_t op , void *op_data )
+//{
+ //return( iterateElems( name.c_str(), idx, op, op_data ));
+//}
+//int Group::iterateElems( const char* name, int *idx, H5G_iterate_t op , void *op_data )
+//{
+ //int ret_value = H5Giterate( id, name, idx, op, op_data );
+ //if( ret_value >= 0 )
+ //return( ret_value );
+ //else // raise exception when H5Aiterate returns a negative value
+ //{
+ //throw GroupIException();
+ //}
+//}
// Calls the C API H5Gclose to close this group. Used by IdComponent::reset
void Group::p_close() const
@@ -366,6 +65,12 @@ void Group::p_close() const
}
}
+// Throw file exception
+void Group::throwException() const
+{
+ throw GroupIException();
+}
+
// The destructor of this instance calls IdComponent::reset to
// reset its identifier - no longer true
// Older compilers (baldric) don't support template member functions
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index fbbd80e..4850bb0 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -82,7 +82,7 @@ IdComponent& IdComponent::operator=( const IdComponent& rhs )
its identifier, its reference counter will be deleted. A new
reference counter is created for the new HDF5 object id.
*/
-void IdComponent::setId( const hid_t new_id )
+void IdComponent::setId( hid_t new_id )
{
// reset the identifier of this object, call appropriate H5Xclose
resetIdComponent( this );