[svn-r22078] New API: H5ltpath_valid

REF: HDFFV-1233

A high-level "H5LTpath_valid" routine for checking if a path is correct
Both Fortran and C version.

Tested: jam (gnu and intel)

3 files changed, 126 insertions, 0 deletions

diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 5525af9..3d2ae3b 100755
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -149,6 +149,7 @@ H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
 
 #define nh5ltget_attribute_ndims_c  H5_FC_FUNC_(h5ltget_attribute_ndims_c, H5LTGET_ATTRIBUTE_NDIMS_C)
 #define nh5ltget_attribute_info_c   H5_FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
+#define nh5ltpath_valid_c       H5_FC_FUNC_(h5ltpath_valid_c, H5LTPATH_VALID_C)
 
 /*-------------------------------------------------------------------------
 * Image
@@ -1197,6 +1198,13 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id,
                             _fcd name,
                             char *buf);
 
+HDF5_HL_F90CSTUBDLL
+int_f
+nh5ltpath_valid_c(hid_t_f *loc_id, 
+		  _fcd path, 
+		  int_f *pathlen, 
+		  int_f *check_object_valid_c);
+
 /*-------------------------------------------------------------------------
 * Image
 *-------------------------------------------------------------------------
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 484acf1..c0b7695 100755
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -2124,3 +2124,54 @@ done:
 
     return ret_value;
 }
+
+/*-------------------------------------------------------------------------
+* Function: h5ltpath_valid_c
+*
+* Purpose: Calls h5ltpath_valid
+*
+* Return: Success: 0, Failure: -1
+*
+* Programmer: M. Scot Breitenfeld
+*
+* Date: February 18, 2012
+*
+* Comments:
+*
+* Modifications:
+*
+*
+*-------------------------------------------------------------------------
+*/
+
+int_f
+nh5ltpath_valid_c(hid_t_f *loc_id, 
+		  _fcd path, 
+		  int_f *pathlen, 
+		  int_f *check_object_valid_c)
+{
+    htri_t ret = -1;
+    char *c_path = NULL;
+    hbool_t check_object_valid;
+
+    /*
+     * convert FORTRAN name to C name
+     */
+    if( NULL == (c_path = (char *)HD5f2cstring(path, (int)*pathlen)))
+      goto done;
+    
+    check_object_valid = FALSE;
+    if(*check_object_valid_c == 1)
+      check_object_valid = TRUE;
+
+    /*
+     * call H5LTpath_valid function.
+     */
+    ret = H5LTpath_valid( (hid_t)*loc_id, c_path, check_object_valid );
+
+done:
+    if(c_path != NULL)
+      free(c_path);
+
+    return (int_f)ret;
+}
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
index cbc9b96..7d53ab7 100755
--- a/hl/fortran/src/H5LTff.f90
+++ b/hl/fortran/src/H5LTff.f90
@@ -6308,6 +6308,73 @@ CONTAINS
     errcode = h5ltget_attribute_info_c(loc_id,namelen,dset_name,attrlen,attr_name,dims,type_class,type_size)
 
   END SUBROUTINE h5ltget_attribute_info_f
+
+  !-------------------------------------------------------------------------
+  ! Function: h5ltpath_valid_f
+  !
+  ! Purpose: Validates a path 
+  !
+  ! Return: Success: 0, Failure: -1
+  !
+  ! Programmer: M. Scot Breitenfeld
+  !
+  ! Date: February 18, 2012
+  !
+  ! Comments:
+  !
+  ! Modifications:
+  !
+  !-------------------------------------------------------------------------
+
+  SUBROUTINE h5ltpath_valid_f(loc_id, path, check_object_valid, path_valid, errcode)
+
+    IMPLICIT NONE
+    !
+    !This definition is needed for Windows DLLs
+    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$attributes dllexport :: h5ltpath_valid_f
+    !DEC$endif
+    !
+    INTEGER(hid_t)  , INTENT(IN)  :: loc_id              ! File or group identifier.
+    CHARACTER(LEN=*), INTENT(IN)  :: path                ! Path to the object to check, relative to loc_id.
+    LOGICAL         , INTENT(IN)  :: check_object_valid  ! Indicates whether to check if the final component 
+                                                         !  of the path resolves to a valid object 
+    LOGICAL         , INTENT(OUT) :: path_valid          ! Object status
+    INTEGER         , INTENT(OUT) :: errcode             ! Error code: 0 on success and -1 on failure
+
+    INTEGER :: pathlen
+    INTEGER :: check_object_valid_c
+    INTEGER :: status
+
+    INTERFACE
+       INTEGER FUNCTION h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c)
+         USE h5global
+         !DEC$IF DEFINED(HDF5F90_WINDOWS)
+         !DEC$ATTRIBUTES C,reference,decorate,alias:'H5LTPATH_VALID_C'::h5ltpath_valid_c
+         !DEC$ENDIF
+         !DEC$ATTRIBUTES reference :: path
+         INTEGER(hid_t),   INTENT(in) :: loc_id  
+         CHARACTER(len=*), INTENT(in) :: path
+         INTEGER :: pathlen
+         INTEGER :: check_object_valid_c
+       END FUNCTION h5ltpath_valid_c
+    END INTERFACE
+
+    check_object_valid_c = 0
+    IF(check_object_valid) check_object_valid_c = 1
+
+    pathlen = LEN(path)
+    status = h5ltpath_valid_c(loc_id, path, pathlen, check_object_valid_c)
+
+    path_valid = .FALSE.
+    errcode = 0
+    IF(status.EQ.1)THEN
+       path_valid = .TRUE.
+    ELSE IF(status.LT.0)THEN
+       errcode = -1
+    ENDIF
+    
+  END SUBROUTINE h5ltpath_valid_f
   !  end
   !
 END MODULE H5LT