Skip to content

FIREFLY-1534: Check for utype in the table's resources if one does not exist in the table.#1636

Merged
loitly merged 1 commit intorc-2024.3from
FIREFLY-1534-spectrum-utype
Oct 9, 2024
Merged

FIREFLY-1534: Check for utype in the table's resources if one does not exist in the table.#1636
loitly merged 1 commit intorc-2024.3from
FIREFLY-1534-spectrum-utype

Conversation

@loitly
Copy link
Copy Markdown
Contributor

@loitly loitly commented Oct 7, 2024

Ticket: https://jira.ipac.caltech.edu/browse/FIREFLY-1534

should work like this:

If the table has a Utype, use it.
If the table does not have a Utype, search "outwards" in the enclosing elements in the XML and use the first one you find. Thus, in the typical nesting: <VOTABLE><RESOURCE><TABLE></TABLE></RESOURCE></VOTABLE> , you would start with the TABLE, and then check the RESOURCE containing it.

Test: https://fireflydev.ipac.caltech.edu/firefly-1534-spectrum-utype/firefly/

  • Load a spectrum where utype is not from <TABLE> but from <RESOURCE>

@loitly loitly added the Charts Anything related to charts label Oct 7, 2024
@loitly loitly added this to the 2024.4 milestone Oct 7, 2024
@loitly loitly requested a review from robyww October 7, 2024 18:56
@loitly loitly self-assigned this Oct 7, 2024
@loitly loitly force-pushed the FIREFLY-1534-spectrum-utype branch from 6317a88 to 2d9e494 Compare October 7, 2024 18:59
@loitly loitly force-pushed the FIREFLY-1534-spectrum-utype branch from 2d9e494 to ca12805 Compare October 9, 2024 17:46
@loitly loitly changed the base branch from dev to rc-2024.3 October 9, 2024 17:46
@loitly loitly merged commit 791c06a into rc-2024.3 Oct 9, 2024
@loitly loitly deleted the FIREFLY-1534-spectrum-utype branch October 9, 2024 17:47
@robyww robyww modified the milestones: 2024.4, 2024.3 Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Charts Anything related to charts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants