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
Add namespaces to exported ISO19139 metadata file. #174
Add namespaces to exported ISO19139 metadata file. #174
Conversation
Found some more untranslated French texts.
@@ -26,13 +26,16 @@ | |||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | |||
exclude-result-prefixes="#all"> | |||
|
|||
<xsl:import href="../update-fixed-info.xsl"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe that by by importing the update-fixed-info.xsl you will be applying all the templates within.
I'm not sure if we want to be applying all those fixes during the export.
i.e. the update-fixed-info.xsl will be applying a gmd:locale for both the main language and the alternate language. This is actually something that we don't want in the export as older geonetwork (i.e. FGP) seem to have issues with them. Does not seem to be an issue with the newer GN.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe you can move "add-namespaces" template to src/main/plugin/iso19139.ca.HNAP/convert/functions.xsl
And then you can include src/main/plugin/iso19139.ca.HNAP/convert/functions.xsl from both update-fixed-info.xsl and to19139.xsl.
The "add-namespaces" is also used in iso19139.ca.HNAP.FGP-to-iso19139.ca.HNAP.xsl so it can probably be updated as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have moved the add-namespace and its related variables to function.xsl as common template. Then include it to fromISO19139, to19139 and update-fixed-info.xsl. It's still working as import and export and code looks much cleaner.
…o19139 and update-fixed-info.xsl includes/imports.
Looks better but you are not using the latest version. Undo your changes from fromISO19139.xsl and apply them to the newer iso19139.ca.HNAP.FGP-to-iso19139.ca.HNAP.xsl and that should resolve your conflicts. |
I would like to release 3.10.6 this week is this pull request to be included? |
@jodygarnett |
I will switch to |
# Conflicts: # src/main/plugin/iso19139.ca.HNAP/convert/ISO19139/fromISO19139.xsl
Sorry Ian. My email seems stuck yesterday. Didn't see your comment. I am resolving the conflict by merging the main metadata101 3.10 to my folk 3.10. Then my folk 3.10 to this branch. I will review your other comment and do fix accordingly. |
I had resolved the conflict. I simply remove the add-namespace declaration and its related variable from "iso19139.ca.HNAP.FGP-to-iso19139.ca.HNAP.xsl" because this xsl already includes the function.xsl. Add-namespace is part of function.xsl. |
@wangf1122 looks good. |
…in functions.xsl. Move the same variable back to update-fixed-info.xsl and keey within this xsl.
Hey Ian. I got it fixed as we discussed. I moved these variables to local scope of add-namespace template and move them back to update-fixed-info.xsl as well. Renamed the variables from add-namespace template to make it different from the variables in update-fixed-info.xsl. Now it looks more organized. Please take a look. |
After the fix, the metadata data contains all needed namespaces