Merge pull request #45 from jakobnissen/fixheader

Fix header code
BioJulia · Apr 14, 2021 · e9202ba · e9202ba
2 parents be40822 + 7d98cbc
commit e9202ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/fasta/record.jl b/src/fasta/record.jl
@@ -205,10 +205,10 @@ end
 
 Returns the stripped header line of `record`, or `nothing` if it was empty.
 """
-function header(record::Record)
-    hasidentifier(record) || return nothing
-    id, desc = record.identifier, record.description
-    range = first(id) : max(last(id), last(desc))
+function header(record::Record)::Union{String, Nothing}
+    id, de = record.identifier, record.description
+    isempty(id) && isempty(de) && return nothing
+    range = isempty(de) ? id : (isempty(id) ? de : first(id):last(de))
     return String(record.data[range])
 end
 

diff --git a/src/fastq/record.jl b/src/fastq/record.jl
@@ -207,10 +207,10 @@ end
 
 Returns the stripped header line of `record`, or `nothing` if it was empty.
 """
-function header(record::Record)
-    hasidentifier(record) || return nothing
-    id, desc = record.identifier, record.description
-    range = first(id) : max(last(id), last(desc))
+function header(record::Record)::Union{String, Nothing}
+    id, de = record.identifier, record.description
+    isempty(id) && isempty(de) && return nothing
+    range = isempty(de) ? id : (isempty(id) ? de : first(id):last(de))
     return String(record.data[range])
 end