Updated export template to produce parsable xml #4497
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krlberry
reviewed
May 27, 2021
| {% endif -%} | ||
| <Filter>{{MainLabel.IsisCube.BandBin.FilterName.Value}}</Filter> | ||
| </DERIVED_HEADER_DATA> | ||
| </CaSSIS_Header> -#} |
There was a problem hiding this comment.
Thanks for commenting-this out. This was the right thing to do here!
krlberry
reviewed
May 27, 2021
| <elements>{{MainLabel.IsisCube.Core.Dimensions.Samples.Value}}</elements> | ||
| <sequence_number>3</sequence_number> | ||
| </Axis_Array> | ||
| <Special_Constants> |
There was a problem hiding this comment.
I think these should still be in the output. Why did they need to be removed? (Did it break the import?)
There was a problem hiding this comment.
It is probably a good Idea to comment this out as well. I think I realized I could comment things after removing this.
There was a problem hiding this comment.
Added back in Array_3D_Image but left the section in comments. There should be an if statement added at some point as to whether to add Array_2D or Array_3D.
krlberry
reviewed
May 27, 2021
| <Axis_Array> | ||
| <axis_name>Sample</axis_name> | ||
| <sequence_number>1</sequence_number> | ||
| <elements>2048</elements> |
There was a problem hiding this comment.
Can the numerical values in here still come from the template?
There was a problem hiding this comment.
I am not quite sure what you mean. I did not look too much into this. I pretty much added this section in to see if it would work in isisimport. It is specifically looking for data in the Array_2D_Image section.
scsides
added a commit
that referenced
this pull request
Jul 27, 2021
* 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
* 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This template is still a work in progress in that it needs to be pulling data from the Isis cube in a lot of places. I commented out the Cassis Header since it is removed when images are reingested in previous isis applications. Not sure if we should keep the same style.
Broken closing tags are fixed in xml. Outputted xml from isisexport can now run through isisimport.
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist:
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: