Skip to content
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

Jump to bottom

Updates XmlToJson parsing to be more inja-friendly #4478

Merged
merged 2 commits into from
May 20, 2021
Merged

Updates XmlToJson parsing to be more inja-friendly #4478

merged 2 commits into from
May 20, 2021

Conversation

krlberry
Copy link
Contributor

@krlberry krlberry commented May 19, 2021 •
edited
Loading

Description

Updates XmlToJson to represent XML attributes by pre-pending them with attrib_ (instead of @) and text values for tags with attributes by _text (instead of #text.) inja was unable to handle keywords with @ or # in the name.

Also updates keyword values which include xml namespaces (ex. cart:longitude ) to use a _ instead of a : to delimit the namespace.

Related Issue

PDS4 work.

Motivation and Context

Get inja able to parse the json created from the XML input label.

How Has This Been Tested?

Tested by-hand to make sure that the values are updated as appropriate, and updated gtest for XmlToJson

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have added myself to the .zenodo.json document.
  • I have added any user impacting changes to the CHANGELOG.md document.

Licensing

This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@krlberry
Updates XmlToJson parsing to indicate XML attributes and text values …
10636e4 
…in a way friendly to inja parsing of the json
amystamile-usgs
amystamile-usgs reviewed May 19, 2021
View reviewed changes
Copy link
Contributor

@amystamile-usgs amystamile-usgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Easy fix! The only concern I have is this may break the existing tests for XmlToJson. May be worth including those changes in this PR as well.

@krlberry
Copy link
Contributor Author

@amystamile-usgs Just added the updates to the test!

amystamile-usgs
amystamile-usgs approved these changes May 19, 2021
View reviewed changes
Copy link
Contributor

@amystamile-usgs amystamile-usgs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@krlberry
Copy link
Contributor Author

@scsides Do you want to take a look at this before I merge it?

@amystamile-usgs amystamile-usgs merged commit 85e1bcd into DOI-USGS:pds4 May 20, 2021
This was referenced Jul 8, 2021
Closed
Closed
scsides added a commit that referenced this pull request Jul 27, 2021
@krlberry @amystamile-usgs
@tgiroux @scsides @kaitlyndlee @jessemapel
Updates to PDS4 branch (#4505)
ce631c5 
* Initial isisimport application  (#4470)

* Initial isisimport application modeled to work on importing tgocassis images

* Add template to toisis

* Draft cassis template file added to pds4 branch (#4472)

* Initial isisimport application modeled to work on importing tgocassis images

* Add template to toisis

* actual cassis label template

* Reverted accidently modified template

* Add new locations of import and export templates and update cmake accordingly (#4477)

* Update cmake to new locations of import and export templates

* Fix mixed tabs and spaces

* Removed topds4 directory from CMakeLists

* Updates XmlToJson parsing to be more inja-friendly (#4478)

* Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json

* Update XmlToJson tests

* Tgocassis Template Completed for Instruments and Archive Groups (#4481)

* Updates to cassis label template

* Further updates to cassis template

* Updates to accomodate PR 4478 changes

* Cassis template completed for Instrument and Archive Groups.

* Generalize PDS4 cube creation setup (#4485)

* Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json

* Update XmlToJson tests

* Generalized line/sample/band setup

* PDS4PixelType as a callback, TEMPLATE default option, and working TGOCaSSIS.tpl (#4479)

* Cassis Template Updated BandBin and AlphaCube Groups (#4482)

* tgocassis Template Completed for AlphaCube and BandBin groups

* Additional template cleanup

* Updated Pixels Group

* Removed core object from template.

* protect template search and improve TGOCASSIS template (#4486)

* Renamed topds4 to isisexport (#4488)

* Updates to Cassis Template and XML and Minor corrections to isisimport (#4490)

* Updates to cassis template. Corrections to isisimport to allow module tests to work properly.

* Added disclaimer to xml file.

* Added mapping group template file (#4492)

* Added checks for existing keywords to be able to export an imported tgo image

* Added separate mapping group translation file

* Callbacks for YearDOY and ConvertUniqueIdtoObservationId (#4491)

* isisimport can now default to correct template using a file template. Updated Cassis template name. Minor updates in isisimport. (#4493)

* Updates mapping group in template. Added callback to handle added Z to StartTime. (#4495)

* PDS4 - Fix template search and targetGroup template variable for tgocassis.tpl (#4494)

* fix template search and targetGroup template variable for tgocassis.tpl

* remove accidental extra tag

* address feedback from amy

* Updated export template to produce parsable xml (#4497)

* Updated export template to be functioning xml to be used in isisimport.

* Added back 3D_Array but left in comments.

* Adds tests with test data and fixes off-by-one error in isisimport (#4502)

* Added intial working section of tests

* Update test with test data and fix off-by-one in isisimport

* Add test input image

* Clean up from old design of test

* Updated based on feedback

* Moved local function into ISIS namespace

* Ticked ISIS version to 6

* More tick to 6

* Updated CHANGELOG

We don't add the 6.0.0 heading until just before the actual release. I also added some missing periods.

Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Tim Giroux <[email protected]>
Co-authored-by: Stuart Sides <[email protected]>
Co-authored-by: Kaitlyn Lee <[email protected]>
Co-authored-by: Jesse Mapel <[email protected]>
acpaquette pushed a commit to acpaquette/ISIS3 that referenced this pull request Sep 8, 2021
@krlberry @amystamile-usgs
@tgiroux @scsides @kaitlyndlee @jessemapel @acpaquette
Updates to PDS4 branch (DOI-USGS#4505)
9af5424 
* Initial isisimport application  (DOI-USGS#4470)

* Initial isisimport application modeled to work on importing tgocassis images

* Add template to toisis

* Draft cassis template file added to pds4 branch (DOI-USGS#4472)

* Initial isisimport application modeled to work on importing tgocassis images

* Add template to toisis

* actual cassis label template

* Reverted accidently modified template

* Add new locations of import and export templates and update cmake accordingly (DOI-USGS#4477)

* Update cmake to new locations of import and export templates

* Fix mixed tabs and spaces

* Removed topds4 directory from CMakeLists

* Updates XmlToJson parsing to be more inja-friendly (DOI-USGS#4478)

* Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json

* Update XmlToJson tests

* Tgocassis Template Completed for Instruments and Archive Groups (DOI-USGS#4481)

* Updates to cassis label template

* Further updates to cassis template

* Updates to accomodate PR 4478 changes

* Cassis template completed for Instrument and Archive Groups.

* Generalize PDS4 cube creation setup (DOI-USGS#4485)

* Updates XmlToJson parsing to indicate XML attributes and text values in a way friendly to inja parsing of the json

* Update XmlToJson tests

* Generalized line/sample/band setup

* PDS4PixelType as a callback, TEMPLATE default option, and working TGOCaSSIS.tpl (DOI-USGS#4479)

* Cassis Template Updated BandBin and AlphaCube Groups (DOI-USGS#4482)

* tgocassis Template Completed for AlphaCube and BandBin groups

* Additional template cleanup

* Updated Pixels Group

* Removed core object from template.

* protect template search and improve TGOCASSIS template (DOI-USGS#4486)

* Renamed topds4 to isisexport (DOI-USGS#4488)

* Updates to Cassis Template and XML and Minor corrections to isisimport (DOI-USGS#4490)

* Updates to cassis template. Corrections to isisimport to allow module tests to work properly.

* Added disclaimer to xml file.

* Added mapping group template file (DOI-USGS#4492)

* Added checks for existing keywords to be able to export an imported tgo image

* Added separate mapping group translation file

* Callbacks for YearDOY and ConvertUniqueIdtoObservationId (DOI-USGS#4491)

* isisimport can now default to correct template using a file template. Updated Cassis template name. Minor updates in isisimport. (DOI-USGS#4493)

* Updates mapping group in template. Added callback to handle added Z to StartTime. (DOI-USGS#4495)

* PDS4 - Fix template search and targetGroup template variable for tgocassis.tpl (DOI-USGS#4494)

* fix template search and targetGroup template variable for tgocassis.tpl

* remove accidental extra tag

* address feedback from amy

* Updated export template to produce parsable xml (DOI-USGS#4497)

* Updated export template to be functioning xml to be used in isisimport.

* Added back 3D_Array but left in comments.

* Adds tests with test data and fixes off-by-one error in isisimport (DOI-USGS#4502)

* Added intial working section of tests

* Update test with test data and fix off-by-one in isisimport

* Add test input image

* Clean up from old design of test

* Updated based on feedback

* Moved local function into ISIS namespace

* Ticked ISIS version to 6

* More tick to 6

* Updated CHANGELOG

We don't add the 6.0.0 heading until just before the actual release. I also added some missing periods.

Co-authored-by: Amy Stamile <[email protected]>
Co-authored-by: Tim Giroux <[email protected]>
Co-authored-by: Stuart Sides <[email protected]>
Co-authored-by: Kaitlyn Lee <[email protected]>
Co-authored-by: Jesse Mapel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scsides scsides scsides approved these changes

@amystamile-usgs amystamile-usgs amystamile-usgs approved these changes

@tgiroux tgiroux Awaiting requested review from tgiroux

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@krlberry @scsides @amystamile-usgs