# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1273762991 -3600
# Node ID 2fd8a273d6d6cf0b59ff1e29f61c0d5f2a0e2187
# Parent  eccc98839441f070889c46657b5d9e1df6a38557
More forgiving system model tools handing of xsltproc and levels in nested packages

diff -r eccc98839441 -r 2fd8a273d6d6 sysmodelgen/core/draw-model.xsl
--- a/sysmodelgen/core/draw-model.xsl	Thu May 13 15:57:44 2010 +0100
+++ b/sysmodelgen/core/draw-model.xsl	Thu May 13 16:03:11 2010 +0100
@@ -1029,6 +1029,20 @@
 	</xsl:if>
 </xsl:template>
 
+
+<xsl:template match="layer/package/package[@levels]" mode="levels" priority="1">
+<!-- a nested package with levels defined in the layer  -->
+	<xsl:call-template name="levels-list">
+		<xsl:with-param name="levels" select="normalize-space(@levels)"/>
+	</xsl:call-template>
+	<xsl:if test="descendant::collection[not(contains(concat(' ',normalize-space(current()/@levels),' '),@level)) or not(@level)]">
+		<!--<xsl:call-template name="Caller-Warning">
+			<xsl:with-param name="text">collection without valid level in package <xsl:value-of select="@id"/></xsl:with-param>
+		</xsl:call-template>-->	
+		<level/>
+	</xsl:if>
+</xsl:template>
+
 <xsl:template match="layer/package[@levels]/package" mode="levels" priority="1">
 	<!-- a package with levels and a nested pkg  -->
 	<xsl:call-template name="levels-list">
diff -r eccc98839441 -r 2fd8a273d6d6 sysmodelgen/core/joinsysdef-module.xsl
--- a/sysmodelgen/core/joinsysdef-module.xsl	Thu May 13 15:57:44 2010 +0100
+++ b/sysmodelgen/core/joinsysdef-module.xsl	Thu May 13 16:03:11 2010 +0100
@@ -128,7 +128,8 @@
 		reverse order so we can try to use the first namespace prefix defined if it's available-->
 	<xsl:for-each select="document(@href,.)/*">
 		<xsl:apply-templates select="//*[(self::component or self::collection or self::package or self::layer) and @href]" mode="scan-for-namespaces"/>
-		<xsl:for-each select="//namespace::* | @id-namespace">
+		<xsl:for-each select="//namespace::*[.!='http://www.w3.org/XML/1998/namespace'] | @id-namespace">
+			<!-- ignore XML namespace -->
 			<xsl:value-of select="concat(name(),' ',.,'&#xa;')"/>
 		</xsl:for-each>
 	</xsl:for-each>