You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ha...@apache.org on 2003/11/08 22:42:29 UTC

cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java esql.xsl

haul        2003/11/08 13:42:29

  Modified:    src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  Bug 24305 [PATCH] - esql:get-xml ; wraping result with root element in a namespace
  by okrasz@o2.pl (Marcin Okraszewski)
  
  Revision  Changes    Path
  1.8       +20 -2     cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- esql.xsl	6 Oct 2003 15:36:08 -0000	1.7
  +++ esql.xsl	8 Nov 2003 21:42:29 -0000	1.8
  @@ -924,10 +924,28 @@
       <xsl:choose>
         <xsl:when test="@root">
           <xsl:text>"&lt;</xsl:text>
  +        <xsl:if test="@root-ns-prefix">
  +            <xsl:value-of select="@root-ns-prefix"/>
  +            <xsl:text>:</xsl:text>
  +        </xsl:if>
           <xsl:value-of select="@root"/>
  +        <xsl:if test="@root-ns">
  +            <xsl:text> xmlns</xsl:text>
  +            <xsl:if test="@root-ns-prefix">
  +                <xsl:text>:</xsl:text>
  +                <xsl:value-of select="@root-ns-prefix"/>
  +            </xsl:if>
  +            <xsl:text>=\&quot;</xsl:text>
  +            <xsl:value-of select="@root-ns"/>
  +            <xsl:text>\&quot;</xsl:text>
  +        </xsl:if>
           <xsl:text>&gt;"+</xsl:text>
           <xsl:call-template name="get-string"/>
           <xsl:text>+"&lt;/</xsl:text>
  +        <xsl:if test="@root-ns-prefix">
  +            <xsl:value-of select="@root-ns-prefix"/>
  +            <xsl:text>:</xsl:text>
  +        </xsl:if>
           <xsl:value-of select="@root"/>
           <xsl:text>&gt;"</xsl:text>
         </xsl:when>