cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject svn commit: r452491 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl status.xml
Date Tue, 03 Oct 2006 13:27:13 GMT
Author: joerg
Date: Tue Oct  3 06:27:12 2006
New Revision: 452491

URL: http://svn.apache.org/viewvc?view=rev&rev=452491
Log:
Fix COCOON-1196: Use namespace-uri and not the namespace-prefix to select parameters in logicsheet-util.xsl.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl?view=diff&rev=452491&r1=452490&r2=452491
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/java/logicsheet-util.xsl
Tue Oct  3 06:27:12 2006
@@ -119,20 +119,11 @@
     <xsl:param name="default"/>
     <xsl:param name="required">false</xsl:param>
 
-    <!-- for some unknown reason this needs to be called every time,
-         otherwise only the first invocation uses a correct namespace
-         prefix. -->
-    <xsl:variable name="namespace-prefix"><xsl:call-template name="get-namespace-prefix"/></xsl:variable>
-
-    <xsl:variable name="qname">
-      <xsl:value-of select="concat($namespace-prefix, ':param')"/>
-    </xsl:variable>
-
     <xsl:choose>
       <xsl:when test="@*[name(.) = $name]">"<xsl:value-of select="@*[name(.) = $name]"/>"</xsl:when>
-      <xsl:when test="(*[name(.) = $qname])[@name = $name]">
+      <xsl:when test="(*[namespace-uri(.) = $namespace-uri and local-name(.) = 'param'])[@name
= $name]">
         <xsl:call-template name="get-nested-string">
-          <xsl:with-param name="content" select="(*[name(.) = $qname])[@name = $name]"/>
+          <xsl:with-param name="content" select="(*[namespace-uri(.) = $namespace-uri
and local-name(.) = 'param'])[@name = $name]"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
@@ -194,20 +185,11 @@
     <xsl:param name="default"/>
     <xsl:param name="required">false</xsl:param>
 
-    <!-- for some unknown reason this needs to be called every time,
-         otherwise only the first invocation uses a correct namespace
-         prefix. -->
-    <xsl:variable name="namespace-prefix"><xsl:call-template name="get-namespace-prefix"/></xsl:variable>
-
-    <xsl:variable name="qname">
-      <xsl:value-of select="concat($namespace-prefix, ':param')"/>
-    </xsl:variable>
-
     <xsl:choose>
       <xsl:when test="@*[name(.) = $name]"><xsl:value-of select="@*[name(.) = $name]"/></xsl:when>
-      <xsl:when test="(*[name(.) = $qname])[@name = $name]">
+      <xsl:when test="(*[namespace-uri(.) = $namespace-uri and local-name(.) = 'param'])[@name
= $name]">
         <xsl:call-template name="get-nested-content">
-          <xsl:with-param name="content" select="(*[name(.) = $qname])[@name = $name]"/>
+          <xsl:with-param name="content" select="(*[namespace-uri(.) = $namespace-uri
and local-name(.) = 'param'])[@name = $name]"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
@@ -254,20 +236,11 @@
     <xsl:param name="default"/>
     <xsl:param name="required">false</xsl:param>
 
-    <!-- for some unknown reason this needs to be called every time,
-         otherwise only the first invocation uses a correct namespace
-         prefix. -->
-    <xsl:variable name="namespace-prefix"><xsl:call-template name="get-namespace-prefix"/></xsl:variable>
-
-    <xsl:variable name="qname">
-      <xsl:value-of select="concat($namespace-prefix, ':param')"/>
-    </xsl:variable>
-
     <xsl:choose>
       <xsl:when test="@*[name(.) = $name]">"<xsl:value-of select="@*[name(.) = $name]"/>"</xsl:when>
-      <xsl:when test="(*[name(.) = $qname])[@name = $name]">
+      <xsl:when test="(*[namespace-uri(.) = $namespace-uri and local-name(.) = 'param'])[@name
= $name]">
         <xsl:call-template name="get-nested-content">
-          <xsl:with-param name="content" select="(*[name(.) = $qname])[@name = $name]"/>
+          <xsl:with-param name="content" select="(*[namespace-uri(.) = $namespace-uri
and local-name(.) = 'param'])[@name = $name]"/>
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/status.xml?view=diff&rev=452491&r1=452490&r2=452491
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Oct  3 06:27:12 2006
@@ -184,6 +184,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.10" date="TBD">
+    <action dev="JH" type="fix" fixes-bug="COCOON-1196">
+      XSP: Use namespace-uri and not the namespace-prefix to select parameters in logicsheet-util.xsl.
+    </action>
     <action dev="VG" type="fix" fixes-bug="COCOON-1462">
       Databases: Check for null LOBs.
     </action>



Mime
View raw message