Merge pull request #264 from jacobwilliams/get-path-fix

Get path fix

Author: jacobwilliams

src/json_value_module.F90

@@ -5577,9 +5577,6 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
     logical(LK)                                :: use_brackets   !! to use '[]' characters for arrays
     logical(LK)                                :: parent_is_root !! if the parent is the root
 
-    !initialize:
-    path = CK_''
-
     !optional input:
     if (present(use_alt_array_tokens)) then
         use_brackets = .not. use_alt_array_tokens
@@ -5597,13 +5594,19 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
 
             !get info about the current variable:
             call json%info(tmp,name=name)
+            if (json%path_mode==2) then
+                name = encode_rfc6901(name)
+            end if
 
             ! if tmp a child of an object, or an element of an array
             if (associated(tmp%parent)) then
 
                 !get info about the parent:
                 call json%info(tmp%parent,var_type=var_type,&
                                n_children=n_children,name=parent_name)
+                if (json%path_mode==2) then
+                    parent_name = encode_rfc6901(parent_name)
+                end if
 
                 select case (var_type)
                 case (json_array)
@@ -5680,7 +5683,7 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
     end if
 
     !for errors, return blank string:
-    if (json%exception_thrown) then
+    if (json%exception_thrown .or. .not. allocated(path)) then
         path = CK_''
     else
         if (json%path_mode==2) then
@@ -5712,14 +5715,14 @@ subroutine add_to_path(str,path_sep)
         select case (json%path_mode)
         case(2)
             ! in this case, the options are ignored
-            if (path==CK_'') then
+            if (.not. allocated(path)) then
                 path = str
             else
                 path = str//slash//path
             end if
         case(1)
             ! default path format
-            if (path==CK_'') then
+            if (.not. allocated(path)) then
                 path = str
             else
                 if (present(path_sep)) then

src/tests/jf_test_23.f90

@@ -32,6 +32,7 @@ subroutine test_23(error_cnt)
     real(wp) :: rval
     logical :: found
     character(kind=json_CK,len=10),dimension(:),allocatable :: cval_array
+    integer :: i !! counter
 
     error_cnt = 0
     call json%initialize(   trailing_spaces_significant=.true.,&
@@ -220,20 +221,27 @@ subroutine test_23(error_cnt)
                             path_mode=2) ! RFC6901 paths
 
     write(error_unit,'(A)') ''
-    key = '/data/1/real'
-    call json%get(key,p)
-    call core%get_path(p, path, found)
-    if (found) then
-        if (key==path) then
-            write(error_unit,'(A)') 'get_path test passed: '//path
+    do i = 1, 4
+        select case (i)
+            case(1); key = '/data/1/real'
+            case(2); key = '/rfc6901 tests/  '
+            case(3); key = '/rfc6901 tests/m~0n'
+            case(4); key = '/rfc6901 tests/a~1b'
+        end select
+        call json%get(key,p)
+        call core%get_path(p, path, found)
+        if (found) then
+            if (key==path) then
+                write(error_unit,'(A)') 'get_path test passed: '//path
+            else
+                write(error_unit,'(A)') 'Error: path does not match: '//path//' '//key
+                error_cnt = error_cnt + 1
+            end if
         else
-            write(error_unit,'(A)') 'Error: path does not match: '//path//' '//key
+            write(error_unit,'(A)') 'Error: could not find '//key
             error_cnt = error_cnt + 1
         end if
-    else
-        write(error_unit,'(A)') 'Error: could not find '//key
-        error_cnt = error_cnt + 1
-    end if
+    end do
 
     ! clean up
     write(error_unit,'(A)') ''