diff --git a/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-multilingual.xml b/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-multilingual.xml index 4e71365e..3f3b9513 100644 --- a/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-multilingual.xml +++ b/src/main/plugin/iso19139.ca.HNAP/loc/eng/schematron-rules-multilingual.xml @@ -45,7 +45,8 @@ Value mismatched for Security User Note in both languages Security User Note is not valid for the classification code selected. Valid values are: Security User Note should be empty for the classification code selected - If you indicate 'Other Restrictions' in the 'Access Constraints' or 'Use Constraints' fields, the other constraints for accessing or using the resource should be explained here. + If you have indicated 'Other Restrictions' in either the 'Access Constraints' or 'Use Constraints' fields, the ‘Other constraints' text box must be completed. + If you did not indicate 'Other Restrictions' in either the 'Access Constraints' or 'Use Constraints' fields, the ‘Other constraints’ text box must be empty. Value is required for Use Limitation in both languages Contact - Organization name is required in both languages diff --git a/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-multilingual.xml b/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-multilingual.xml index c51b4128..f5c0c830 100644 --- a/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-multilingual.xml +++ b/src/main/plugin/iso19139.ca.HNAP/loc/fre/schematron-rules-multilingual.xml @@ -45,7 +45,8 @@ Valeur non concordante pour la note d'utilisateur de sécurité dans les deux langues Explications sur les restrictions n’est pas valide pour la restriction de manipulation. Les valeurs valides sont : Explications sur les restrictions devrait être vide pour la restriction de manipulation - Si vous indiquez «Autres restrictions» dans les champs «Contraintes d'accès» ou «Utiliser les contraintes», les autres contraintes d'accès ou d'utilisation de la ressource doivent être expliquées ici. + Si vous avez indiqué « Autres restrictions » dans les champs « Contraintes d'accès » ou « Contraintes d'utilisation », la zone de texte « Autres contraintes » doit être complétée. + Si vous n'avez pas indiqué « Autres restrictions » dans les champs « Contraintes d'accès » ou « Contraintes d'utilisation », la zone de texte « Autres contraintes » doit être vide. Limitation d'utilisation est obligatoire dans les deux langues Contact - Nom de l'organisation est obligatoire dans les deux langues diff --git a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-multilingual.sch b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-multilingual.sch index 77148154..8fb6acfb 100644 --- a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-multilingual.sch +++ b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-multilingual.sch @@ -741,13 +741,22 @@ and (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609' or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609')) or + (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609' + and ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609' + )" /> + + or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609') + ) or + (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609' + or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609'))" /> $loc/strings/OtherConstraintsNote + $loc/strings/OtherConstraintsNoteEmpty diff --git a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-non-multilingual.sch b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-non-multilingual.sch index ad5efc52..62a4bc57 100644 --- a/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-non-multilingual.sch +++ b/src/main/plugin/iso19139.ca.HNAP/schematron/schematron-rules-non-multilingual.sch @@ -422,13 +422,23 @@ and (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609' or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609')) or + (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609' + and ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609' + ))" /> + + or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue != 'RI_609') + ) or + (../gmd:accessConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609' + or ../gmd:useConstraints/gmd:MD_RestrictionCode/@codeListValue = 'RI_609') + )" /> $loc/strings/OtherConstraintsNote + $loc/strings/OtherConstraintsNoteEmpty