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

Metadata citation improvements #8607

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Metadata citation improvements #8607

merged 2 commits into from
Feb 10, 2025

Conversation

josegar74
Copy link
Member

@josegar74 josegar74 commented Jan 17, 2025

Adds also an option to download the citation file:

citation-save-1

citation-save-2

Checklist

  • I have read the contribution guidelines
  • Pull request provided for main branch, backports managed with label
  • Good housekeeping of code, cleaning up comments, tests, and documentation
  • Clean commit history broken into understandable chucks, avoiding big commits with hundreds of files, cautious of reformatting and whitespace changes
  • Clean commit messages, longer verbose messages are encouraged
  • API Changes are identified in commit messages
  • Testing provided for features or enhancements using automatic tests
  • User documentation provided for new features or enhancements in manual
  • Build documentation provided for development instructions in README.md files
  • Library management using pom.xml dependency management. Update build documentation with intended library use and library tutorials or documentation

Funded by EEA

@josegar74 josegar74 added this to the 4.4.7 milestone Jan 17, 2025
@josegar74 josegar74 requested a review from fxprunayre January 17, 2025 14:41
@josegar74 josegar74 force-pushed the 44-citation-improvements branch 2 times, most recently from 7e69022 to 07c4bac Compare January 20, 2025 14:30
- BibTex: change data entry type to misc (data seems not valid: https://en.wikipedia.org/wiki/BibTeX\#Entry_types).
- RIS: add support for PY (publication year), DA (publication date) LA (language) fields.
@josegar74 josegar74 force-pushed the 44-citation-improvements branch from 07c4bac to 892e45e Compare January 20, 2025 15:48
@josegar74 josegar74 marked this pull request as ready for review January 20, 2025 17:43
@josegar74 josegar74 merged commit 1503036 into main Feb 10, 2025
12 checks passed
@geonetworkbuild
Copy link
Collaborator

The backport to 4.2.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 892e45ea47... Metadata citation improvements:
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/base.xsl
Auto-merging schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
CONFLICT (content): Merge conflict in schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
Auto-merging schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl
CONFLICT (content): Merge conflict in schemas/iso19139/src/main/plugin/iso19139/formatter/citation/base.xsl
CONFLICT (modify/delete): services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-citation-bibtex.txt deleted in HEAD and modified in 892e45ea47 (Metadata citation improvements:).  Version 892e45ea47 (Metadata citation improvements:) of services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-citation-bibtex.txt left in tree.
CONFLICT (modify/delete): services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-citation-ris.txt deleted in HEAD and modified in 892e45ea47 (Metadata citation improvements:).  Version 892e45ea47 (Metadata citation improvements:) of services/src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-citation-ris.txt left in tree.
CONFLICT (modify/delete): services/src/test/resources/org/fao/geonet/api/records/formatters/iso19139-citation-bibtex.txt deleted in HEAD and modified in 892e45ea47 (Metadata citation improvements:).  Version 892e45ea47 (Metadata citation improvements:) of services/src/test/resources/org/fao/geonet/api/records/formatters/iso19139-citation-bibtex.txt left in tree.
CONFLICT (modify/delete): services/src/test/resources/org/fao/geonet/api/records/formatters/iso19139-citation-ris.txt deleted in HEAD and modified in 892e45ea47 (Metadata citation improvements:).  Version 892e45ea47 (Metadata citation improvements:) of services/src/test/resources/org/fao/geonet/api/records/formatters/iso19139-citation-ris.txt left in tree.

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.2.x 4.2.x
# Navigate to the new working tree
cd .worktrees/backport-4.2.x
# Create a new branch
git switch --create backport-8607-to-4.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 892e45ea47b5891f41419bcf1a61e1bb9dc5f20c,72130a0f888f3f04665084d4f2c181b564d199a3
# Push it to GitHub
git push --set-upstream origin backport-8607-to-4.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.2.x

Then, create a pull request where the base branch is 4.2.x and the compare/head branch is backport-8607-to-4.2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants