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.

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

Xinclude example #205

Merged
merged 18 commits into from
Sep 27, 2024
Merged

Xinclude example #205

merged 18 commits into from
Sep 27, 2024

Conversation

ChrisJohnNOAA
Copy link
Contributor

Description

This uses XInclude (when SAX parser is on) to load variables of a dataset. The code supported it already, this is adding tests of XInclude. There is also some minor refactoring of the parser handlers to reduce duplication.

Fixes #112

Type of change

  • [ X ] New feature (non-breaking change which adds functionality)
  • [ X ] This change requires a documentation update

Checklist before requesting a review

  • [ X ] I have performed a self-review of my code
  • [ X ] My code follows the style guidelines of this project
  • [ X ] I have commented my code, particularly in hard-to-understand areas
  • [ X ] I have made corresponding changes to the documentation
  • [ X ] My changes generate no new warnings
  • [ X ] I have added tests that prove my fix is effective or that my feature works
  • [ X ] New and existing unit tests pass locally with my changes

ChrisJohnNOAA and others added 18 commits September 17, 2024 09:32
… in a test EDDTestDataset.get{id}() request wait for file copies/data caching to finish instead of throwing an error due to no files (or using whatever subset of files were copied). There's also a fix for metadata in EDDTable where the max value was incorrect in some circumstances when loading a dataset without a cache.

In some error cases table writers were not getting closed. This possible leak of file handles is fixed.
@ChrisJohnNOAA ChrisJohnNOAA merged commit c492815 into ERDDAP:main Sep 27, 2024
srstsavage pushed a commit to srstsavage/erddap that referenced this pull request Sep 29, 2024
* Make tests less flaky. The biggest change for this is having datasets in a test EDDTestDataset.get{id}() request wait for file copies/data caching to finish instead of throwing an error due to no files (or using whatever subset of files were copied). There's also a fix for metadata in EDDTable where the max value was incorrect in some circumstances when loading a dataset without a cache.

In some error cases table writers were not getting closed. This possible leak of file handles is fixed.

* Fix zarr files

* Format code, set SAX parser to true for tests.

* Have tests handle differences on different machines better.

* fix check for testPmelTaoAirt

* Use xinclude for parts of dataset definitions

* Deflake intetgration tests on linux (and turn off the saveopendap test due to external server)

* Clean up changes relating to testing XInclude (XInclude testing/example will come later).

* clean up the xinclude (new lines after the tag)

* Change a test dataset to use XInclude when using the SAX parser. Also changes the handlers to share some code.

---------

Co-authored-by: Chris John <Chris.P.John@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using XInclude
2 participants