# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1288086230 -3600
# Node ID a2e65c705db86a8822799513d9e35f0bbfc37a57
# Parent  3c36c452f013a41cafdcd220f4551fcbf3136eff
Fix for bug when joining where ID prefixes would be added even if they use the default ID namespace

diff -r 3c36c452f013 -r a2e65c705db8 sysmodellibs/sysmodelgen/core/joinsysdef-module.xsl
--- a/sysmodellibs/sysmodelgen/core/joinsysdef-module.xsl	Wed Oct 13 16:21:25 2010 +0100
+++ b/sysmodellibs/sysmodelgen/core/joinsysdef-module.xsl	Tue Oct 26 10:43:50 2010 +0100
@@ -467,7 +467,7 @@
 	<xsl:variable name="prefix" select="name($namespaces[.=$ns])"/>
 	<xsl:attribute name="{name()}">
 	<xsl:choose>
-		<xsl:when test="$prefix = 'id-namespace' or  (not($namespaces[name()='id-namespace']) and $ns=$defaultns)"/> <!-- it's the default namespace, no prefix -->
+		<xsl:when test="$prefix = 'id-namespace' or $namespaces[name()='id-namespace']=$ns or  (not($namespaces[name()='id-namespace']) and $ns=$defaultns)"/> <!-- it's the default namespace, no prefix -->
 		<xsl:when test="$prefix='' and contains(.,':')">
 			<!-- complex: copy id and copy namespace (namespace should be copied already)-->
 			<xsl:value-of select="."/>