INTEGRATION: CWS cfgimpex (1.6.38); FILE MERGED
2004/12/10 07:58:01 jb 1.6.38.1: #i36020# Change handling of module-dependent values - now the module attribute is directly on the value; Add check for duplicate node names.
This commit is contained in:
parent
bbaf21981e
commit
7b37bbf3a3
1 changed files with 47 additions and 2 deletions
|
@ -3,9 +3,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: data_val.xsl,v $
|
* $RCSfile: data_val.xsl,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.6 $
|
* $Revision: 1.7 $
|
||||||
*
|
*
|
||||||
* last change: $Author: hr $ $Date: 2004-11-09 11:49:05 $
|
* last change: $Author: rt $ $Date: 2005-01-07 10:04:44 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to the terms of
|
* The Contents of this file are made available subject to the terms of
|
||||||
* either of the following licenses
|
* either of the following licenses
|
||||||
|
@ -159,6 +159,7 @@
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
|
|
||||||
<xsl:call-template name="checkModule"/>
|
<xsl:call-template name="checkModule"/>
|
||||||
|
<xsl:call-template name="checkDuplicates"/>
|
||||||
|
|
||||||
<xsl:choose>
|
<xsl:choose>
|
||||||
<!-- look for matching templates in other components -->
|
<!-- look for matching templates in other components -->
|
||||||
|
@ -222,7 +223,36 @@
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
|
|
||||||
<xsl:call-template name="checkModule"/>
|
<xsl:call-template name="checkModule"/>
|
||||||
|
<xsl:call-template name="checkDuplicates"/>
|
||||||
|
|
||||||
|
<xsl:apply-templates />
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
<!-- ****************************************** -->
|
||||||
|
<!-- * value *** -->
|
||||||
|
<!-- ****************************************** -->
|
||||||
|
<xsl:template match="value">
|
||||||
|
<xsl:call-template name="checkModule"/>
|
||||||
|
|
||||||
|
<xsl:if test="@install:module">
|
||||||
|
<xsl:variable name = "path">
|
||||||
|
<xsl:call-template name="collectPath"/>
|
||||||
|
</xsl:variable>
|
||||||
|
<xsl:variable name = "module" select="@install:module"/>
|
||||||
|
|
||||||
|
<xsl:if test="@oor:lang">
|
||||||
|
<xsl:message terminate="yes">ERROR: Value in property '<xsl:value-of select="$path"/>' has module and locale!</xsl:message>
|
||||||
|
</xsl:if>
|
||||||
|
<xsl:if test="following-sibling::value[@install:module=$module]">
|
||||||
|
<xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has multiple values for module <xsl:value-of select="$module"/>!</xsl:message>
|
||||||
|
</xsl:if>
|
||||||
|
<xsl:if test="../value[not(@install:module)]">
|
||||||
|
<xsl:message terminate="yes">ERROR: Property '<xsl:value-of select="$path"/>' has values both with and without module. This is currently not supported. Please contact jb@openoffice.org, if you need this!</xsl:message>
|
||||||
|
</xsl:if>
|
||||||
|
<xsl:if test="not(preceding-sibling::value/@install:module)">
|
||||||
|
<xsl:message>ATTENTION: Property '<xsl:value-of select="$path"/>' has different values for different modules. Make sure the modules are mutually exclusive!</xsl:message>
|
||||||
|
</xsl:if>
|
||||||
|
</xsl:if>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
<!-- ****************************************** -->
|
<!-- ****************************************** -->
|
||||||
|
@ -261,6 +291,21 @@
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
|
|
||||||
<xsl:call-template name="checkModule"/>
|
<xsl:call-template name="checkModule"/>
|
||||||
|
<xsl:call-template name="checkDuplicates"/>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ************************************* -->
|
||||||
|
<!-- * checkDuplicates *** -->
|
||||||
|
<!-- ************************************* -->
|
||||||
|
<xsl:template name="checkDuplicates">
|
||||||
|
<xsl:variable name="item-name" select="@oor:name"/>
|
||||||
|
<xsl:if test="following-sibling::*[@oor:name = $item-name]">
|
||||||
|
<xsl:variable name = "path">
|
||||||
|
<xsl:call-template name="collectPath"/>
|
||||||
|
</xsl:variable>
|
||||||
|
<xsl:message terminate="yes">ERROR: Duplicate node/prop '<xsl:value-of select="$path"/>'!</xsl:message>
|
||||||
|
</xsl:if>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue