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

include expression/extent in filter_put expression template, include perfDuration in HTML output; fixes #158 #179

Merged
merged 7 commits into from
Nov 28, 2023

Conversation

peterprovaznik
Copy link
Collaborator

@peterprovaznik peterprovaznik commented Nov 15, 2023

"extent" was not part of the list of apply-templates instructions in the expression template, which resulted in it being removed post-filter_put.xsl.

Clemens (@gucl-mu) insists (and I tend to agree) that extent should really have both @quantity and @unit (which would require the list of supported units in unit-select.xml to be extended) to be useful. This, however, would be a non-trivial change in several places which in my opinion would unreasonably widen the scope of this PR (and should have a PR of its own).

I have also noticed that "height" is hard-coded in the xf:setvalue in unit-select.xml, which is most likely erroneous (since this is also used for e.g. width); I have, however, since this is not directly related to the issue at hand, decided not to change it here (originally I did, then tests failed, then I reverted it, tests still failed, then I realized it should most likely be handled separately).

@peterstadler peterstadler linked an issue Nov 16, 2023 that may be closed by this pull request
@peterstadler peterstadler self-requested a review November 16, 2023 07:22
@peterstadler peterstadler added this to the Release 2.0 milestone Nov 16, 2023
@peterstadler
Copy link
Member

peterstadler commented Nov 16, 2023

Hi @peterprovaznik , could you please rebase your branch on develop and force push? There have been some updates to the test dependencies #180 which should fix the failing tests here.

Copy link
Member

@peterstadler peterstadler left a comment

Choose a reason for hiding this comment

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

@daniel-jettka and I were just having a look and found that

  • <extent> was saved to XML and displayed as HTML properly

  • <perfDuration> was saved to XML and displayed as HTML properly WHEN it was entered on the highest (i.e. work level?) expression

  • <perfDuration> was saved to XML BUT NOT displayed as HTML properly when entered on the component level (e.g. expression/componentList/expression/perfDuration)

@peterprovaznik
Copy link
Collaborator Author

Thanks for reviewing! I have added the <apply-templates/> for <perfDuration> in the <componentList>/<expression> template as well. I have also reverted the added newlines to reduce diff-noise, so feel free to squash when merging.

Copy link
Member

@peterstadler peterstadler left a comment

Choose a reason for hiding this comment

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

Just tested and can confirm that both duration and extent are saved as XML and displayed as HTML properly. Many thanks!

@peterstadler peterstadler merged commit 8d88658 into develop Nov 28, 2023
6 checks passed
@peterstadler peterstadler deleted the issue-158 branch November 28, 2023 14:39
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.

"Extent" does not save
2 participants