Skip to content

feat: add string constructor for Epoch types and fix attribute header search logic #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beforerr merged 1 commit into from
Oct 4, 2025
Merged

feat: add string constructor for Epoch types and fix attribute header search logic #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/epochs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ for f in (:year, :month, :day, :hour, :minute, :second, :millisecond)
@eval Dates.$f(epoch::CDFDateTime) = Dates.$f(DateTime(epoch))
end

Epoch(s::AbstractString) = Epoch(DateTime(s))
Epoch16(s::AbstractString) = Epoch16(DateTime(s))
TT2000(s::AbstractString) = TT2000(DateTime(s))

Dates.value(epoch::Epoch) = epoch.instant
Dates.value(epoch::Epoch16) = ComplexF64(epoch.seconds, epoch.picoseconds)
Dates.value(epoch::TT2000) = epoch.instant.value
Expand Down
25 changes: 15 additions & 10 deletions src/loading/attribute.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,14 @@ function vattrib(cdf::CDFDataset, varnum::Integer)
for offset in offsets
is_global(buffer, offset, RecordSizeType) && continue
adr = ADR(buffer, offset, RecordSizeType)
@assert min(adr.AgrEDRhead, adr.AzEDRhead) == 0
head = max(adr.AgrEDRhead, adr.AzEDRhead)
found = _search_aedr_entries(buffer, head, RecordSizeType, cdf_encoding, varnum)
isnothing(found) && continue
name = String(adr.Name)
attributes[name] = _get_attributes(name, found, cdf)
for head in (adr.AgrEDRhead, adr.AzEDRhead)
head == 0 && continue
found = _search_aedr_entries(buffer, head, RecordSizeType, cdf_encoding, varnum)
isnothing(found) && continue
name = String(adr.Name)
attributes[name] = _get_attributes(name, found, cdf)
break
end
end
return attributes
end
Expand Down Expand Up @@ -101,10 +103,13 @@ function vattrib(cdf, varnum, name)
is_global(buffer, offset, RecordSizeType) && continue
adr = ADR(buffer, offset, RecordSizeType)
adr.Name != name_bytes && continue
@assert min(adr.AgrEDRhead, adr.AzEDRhead) == 0
head = max(adr.AgrEDRhead, adr.AzEDRhead)
value = _search_aedr_entries(buffer, head, RecordSizeType, cdf_encoding, varnum)
return _get_attributes(name, value, cdf)
for head in (adr.AgrEDRhead, adr.AzEDRhead)
head == 0 && continue
found = _search_aedr_entries(buffer, head, RecordSizeType, cdf_encoding, varnum)
isnothing(found) && continue
return _get_attributes(name, found, cdf)
end
return nothing
end
return nothing
end
Expand Down
Loading