Index: main/plugin-odf-sync/stylesheets/rof/program2content.xsl =================================================================== --- main/plugin-odf-sync/stylesheets/rof/program2content.xsl (revision 29291) +++ main/plugin-odf-sync/stylesheets/rof/program2content.xsl (working copy) @@ -58,9 +58,12 @@ <!-- @Override Responsable --> <xsl:template name="program-personInCharge"> - <xsl:if test="cdm:contacts/cdm:refPerson[@role='responsable']"> + <xsl:param name="ME" select="/.." /> <!-- /.. = convenient way to specify the empty node-set as defaut value --> + <xsl:param name="SP" select="/.." /> + + <xsl:if test="cdm:contacts/cdm:refPerson[@role='responsable'] or $ME/cdm:contacts/cdm:refPerson[@role='responsable'] or $SP/cdm:contacts/cdm:refPerson[@role='responsable']"> <personInCharge type="person" multiple="true"> - <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='responsable']"> + <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='responsable']|$ME/cdm:contacts/cdm:refPerson[@role='responsable']|$SP/cdm:contacts/cdm:refPerson[@role='responsable']"> <item><xsl:value-of select="@ref"/></item> </xsl:for-each> </personInCharge> @@ -69,9 +72,12 @@ <!-- @Override Contact --> <xsl:template name="program-contact"> - <xsl:if test="cdm:contacts/cdm:refPerson[@role='contact']"> + <xsl:param name="ME" select="/.." /> <!-- /.. = convenient way to specify the empty node-set as defaut value --> + <xsl:param name="SP" select="/.." /> + + <xsl:if test="cdm:contacts/cdm:refPerson[@role='contact'] or $ME/cdm:contacts/cdm:refPerson[@role='contact'] or $SP/cdm:contacts/cdm:refPerson[@role='contact']"> <contact type="person" multiple="true"> - <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='contact']"> + <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='contact']|$ME/cdm:contacts/cdm:refPerson[@role='contact']|$SP/cdm:contacts/cdm:refPerson[@role='contact']"> <item><xsl:value-of select="@ref"/></item> </xsl:for-each> </contact> Index: main/plugin-odf-sync/stylesheets/rof/rof2content.xsl =================================================================== --- main/plugin-odf-sync/stylesheets/rof/rof2content.xsl (revision 29291) +++ main/plugin-odf-sync/stylesheets/rof/rof2content.xsl (working copy) @@ -171,8 +171,14 @@ <xsl:call-template name="program-jointOrgUnit"/> <xsl:call-template name="root-program-orgUnit"/> <xsl:call-template name="program-place"/> - <xsl:call-template name="program-personInCharge"/> - <xsl:call-template name="program-contact"/> + <xsl:call-template name="program-personInCharge"> + <xsl:with-param name="ME" select="$ME-node"/> + <xsl:with-param name="SP" select="$SP-node"/> + </xsl:call-template> + <xsl:call-template name="program-contact"> + <xsl:with-param name="ME" select="$ME-node"/> + <xsl:with-param name="SP" select="$SP-node"/> + </xsl:call-template> <xsl:call-template name="program-programWebSiteUrl"/> <xsl:call-template name="program-programWebSiteLabel"/> <xsl:call-template name="program-successRate"/> Index: main/plugin-odf-sync/stylesheets/rof23/program2content.xsl =================================================================== --- main/plugin-odf-sync/stylesheets/rof23/program2content.xsl (revision 29291) +++ main/plugin-odf-sync/stylesheets/rof23/program2content.xsl (working copy) @@ -56,12 +56,14 @@ </orgUnit> </xsl:template> - <!-- @Override Responsable --> <xsl:template name="program-personInCharge"> - <xsl:if test="cdm:contacts/cdm:refPerson[@role='responsable']"> + <xsl:param name="ME" select="/.." /> <!-- /.. = convenient way to specify the empty node-set as defaut value --> + <xsl:param name="SP" select="/.." /> + + <xsl:if test="cdm:contacts/cdm:refPerson[@role='responsable'] or $ME/cdm:contacts/cdm:refPerson[@role='responsable'] or $SP/cdm:contacts/cdm:refPerson[@role='responsable']"> <personInCharge type="person" multiple="true"> - <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='responsable']"> + <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='responsable']|$ME/cdm:contacts/cdm:refPerson[@role='responsable']|$SP/cdm:contacts/cdm:refPerson[@role='responsable']"> <item><xsl:value-of select="@ref"/></item> </xsl:for-each> </personInCharge> @@ -70,9 +72,12 @@ <!-- @Override Contact --> <xsl:template name="program-contact"> - <xsl:if test="cdm:contacts/cdm:refPerson[@role='contact']"> + <xsl:param name="ME" select="/.." /> <!-- /.. = convenient way to specify the empty node-set as defaut value --> + <xsl:param name="SP" select="/.." /> + + <xsl:if test="cdm:contacts/cdm:refPerson[@role='contact'] or $ME/cdm:contacts/cdm:refPerson[@role='contact'] or $SP/cdm:contacts/cdm:refPerson[@role='contact']"> <contact type="person" multiple="true"> - <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='contact']"> + <xsl:for-each select="cdm:contacts/cdm:refPerson[@role='contact']|$ME/cdm:contacts/cdm:refPerson[@role='contact']|$SP/cdm:contacts/cdm:refPerson[@role='contact']"> <item><xsl:value-of select="@ref"/></item> </xsl:for-each> </contact> Index: main/plugin-odf-sync/stylesheets/rof23/rof2content.xsl =================================================================== --- main/plugin-odf-sync/stylesheets/rof23/rof2content.xsl (revision 29291) +++ main/plugin-odf-sync/stylesheets/rof23/rof2content.xsl (working copy) @@ -171,8 +171,14 @@ <xsl:call-template name="program-jointOrgUnit"/> <xsl:call-template name="root-program-orgUnit"/> <xsl:call-template name="program-place"/> - <xsl:call-template name="program-personInCharge"/> - <xsl:call-template name="program-contact"/> + <xsl:call-template name="program-personInCharge"> + <xsl:with-param name="ME" select="$ME-node"/> + <xsl:with-param name="SP" select="$SP-node"/> + </xsl:call-template> + <xsl:call-template name="program-contact"> + <xsl:with-param name="ME" select="$ME-node"/> + <xsl:with-param name="SP" select="$SP-node"/> + </xsl:call-template> <xsl:call-template name="program-programWebSiteUrl"/> <xsl:call-template name="program-programWebSiteLabel"/> <xsl:call-template name="program-successRate"/>