Merge a173679 into 06df61a

JuliaAstro · Oct 15, 2019 · 892c6e5 · 892c6e5
2 parents 06df61a + a173679
commit 892c6e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/FITSIO.jl b/src/FITSIO.jl
@@ -23,6 +23,7 @@ import Base: getindex,
              close,
              ndims,
              size,
+             getkey,
              haskey,
              keys,
              values

diff --git a/src/header.jl b/src/header.jl
@@ -354,6 +354,9 @@ Array of values (not a copy).
 """
 values(hdr::FITSHeader) = hdr.values
 
+getkey(hdr::FITSHeader, key::String, def) =
+    (haskey(hdr, key) ? getindex(hdr, key) : def)
+
 getindex(hdr::FITSHeader, key::String) = hdr.values[hdr.map[key]]
 getindex(hdr::FITSHeader, i::Integer) = hdr.values[i]
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -82,7 +82,7 @@ using Random # for `randstring`
 
                 # Read the entire array using read to compare with read!
                 a = read(f[1])
-                
+
                 # Read the entire array
                 b = zeros(eltype(indata),size(indata))
                 read!(f[1],b)
@@ -94,16 +94,16 @@ using Random # for `randstring`
                 b = zeros(eltype(indata),2,2)
                 read!(f[1],b,1:2,1:2)
                 @test a[1:2,1:2] == b
-                
+
                 # Read an entire 1D slice
                 b = zeros(eltype(indata),size(indata,1))
                 read!(f[1],b,:,1)
                 @test a[:,1] == b
-                
+
                 b = zeros(eltype(indata),size(indata,2))
                 read!(f[1],b,1,:)
                 @test a[1,:] == b
-                
+
                 # Read a part of a 1D slice
                 b = zeros(eltype(indata),1)
                 read!(f[1],b,1:1,1)
@@ -147,7 +147,7 @@ using Random # for `randstring`
                         @test a[:,ax2] == b[:,ax2]
                     end
 
-                    # Non-contiguous views can not be read into 
+                    # Non-contiguous views can not be read into
                     b_view = view(b,1,:)
                     @test_throws MethodError read!(f[1],b_view,1,:)
                 end
@@ -313,6 +313,11 @@ HISTORY this is a history"""
     inhdr[1] = 2.0  # test settting by index
     set_comment!(inhdr, "INTKEY", "integer keyword") # test setting a comment
 
+    # Test reading possibly missing keyword
+    @test_throws KeyError inhdr["BADKEY"]
+    @test getkey(inhdr, "BADKEY", nothing) === nothing
+    @test getkey(inhdr, "INTKEY", nothing) == inhdr["INTKEY"]
+
     indata = reshape(Float32[1:100;], 5, 20)
     write(f, indata; header=inhdr)