Merge pull request #462 from jacobwilliams/208-default-for-get-by-path

adding default optional args to get by path routines

Author: jacobwilliams

src/json_file_module.F90

@@ -0,0 +1,32 @@
+    type(json_value),pointer :: p
+
+    if (present(default)) then
+        value = default
+    else
+        value = default_if_not_specified
+    end if
+
+    if ( json%exception_thrown ) then
+       call flag_not_found(found)
+       return
+    end if
+
+    nullify(p)
+    call json%get(me=me, path=path, p=p)
+
+    if (.not. associated(p)) then
+        call json%throw_exception('Error in '//routine//':'//&
+                                  ' Unable to resolve path: '// trim(path),found)
+    else
+        call json%get(p,value)
+    end if
+
+    if ( json%exception_thrown ) then
+        if ( present(found) .or. present(default)) then
+            call flag_not_found(found)
+            if (present(default)) value = default
+            call json%clear_exceptions()
+        end if
+    else
+        if ( present(found) ) found = .true.
+    end if

src/json_get_scalar_by_path.inc

@@ -0,0 +1,27 @@
+    type(json_value),pointer :: p
+
+    if ( json%exception_thrown ) then
+        if (present(default)) vec = default
+        call flag_not_found(found)
+        return
+    end if
+
+    nullify(p)
+    call json%get(me=me, path=path, p=p)
+
+    if (.not. associated(p)) then
+        call json%throw_exception('Error in '//routine//':'//&
+                                  ' Unable to resolve path: '// trim(path),found)
+    else
+        call json%get(p,vec)
+    end if
+
+    if ( json%exception_thrown ) then
+        if ( present(found) .or. present(default)) then
+            call flag_not_found(found)
+            if (present(default)) vec = default
+            call json%clear_exceptions()
+        end if
+    else
+        if ( present(found) ) found = .true.
+    end if

src/json_get_vec_by_path.inc

@@ -0,0 +1,43 @@
+    type(json_value),pointer :: p
+
+    if ( json%exception_thrown ) then
+        if (present(default)) then
+            vec = default
+            if (present(default_ilen)) then
+                ilen = default_ilen
+            else
+                allocate(ilen(size(default)))
+                ilen = len(default)
+            end if
+        end if
+        call flag_not_found(found)
+        return
+    end if
+
+    nullify(p)
+    call json%get(me=me, path=path, p=p)
+
+    if (.not. associated(p)) then
+        call json%throw_exception('Error in '//routine//':'//&
+                                  ' Unable to resolve path: '// trim(path),found)
+    else
+        call json%get(p,vec,ilen)
+    end if
+
+    if ( json%exception_thrown ) then
+        if ( present(found) .or. present(default)) then
+            call flag_not_found(found)
+            if (present(default)) then
+                vec = default
+                if (present(default_ilen)) then
+                    ilen = default_ilen
+                else
+                    allocate(ilen(size(default)))
+                    ilen = len(default)
+                end if
+            end if
+            call json%clear_exceptions()
+        end if
+    else
+        if ( present(found) ) found = .true.
+    end if