Return-Path: 
 <forrest-cvs-return-1369-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 59812 invoked from network); 21 Sep 2003 09:29:17 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 21 Sep 2003 09:29:17 -0000
Received: (qmail 21497 invoked by uid 500); 21 Sep 2003 09:28:51 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 21452 invoked by uid 500); 21 Sep 2003 09:28:50 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 21439 invoked from network); 21 Sep 2003 09:28:50 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 21 Sep 2003 09:28:50 -0000
Received: (qmail 59778 invoked by uid 1352); 21 Sep 2003 09:29:16 -0000
Date: 21 Sep 2003 09:29:16 -0000
Message-ID: <20030921092916.59777.qmail@minotaur.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest status.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

jefft       2003/09/21 02:29:15

  Modified:    src/resources/stylesheets Tag: FORREST_05_BRANCH
                        changes2document.xsl
               .        Tag: FORREST_05_BRANCH status.xml
  Log:
  Fix half-baked handling of comma-separated bug ids
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.18.2.1  +42 -16    xml-forrest/src/resources/stylesheets/changes2document.xsl
  
  Index: changes2document.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/changes2document.xsl,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- changes2document.xsl	10 Sep 2003 11:39:08 -0000	1.18
  +++ changes2document.xsl	21 Sep 2003 09:29:15 -0000	1.18.2.1
  @@ -6,11 +6,11 @@
   
    <xsl:import href="copyover.xsl"/>
    
  - <xsl:param name="bugtracking-url"/>
   
    <!-- FIXME (JJP):  bugzilla is hardwired -->
  - <xsl:variable name="bugzilla" select="'http://nagoya.apache.org/bugzilla/'"/>
  - <xsl:variable name="buglist" select="concat($bugzilla, 'buglist.cgi?bug_id=')"/>
  + <xsl:variable name="bugzilla" select="'http://nagoya.apache.org/bugzilla/buglist.cgi?bug_id='"/>
  +
  + <xsl:param name="bugtracking-url" select="$bugzilla"/>
   
    <xsl:template match="/">
     <xsl:apply-templates select="//changes"/>
  @@ -59,22 +59,48 @@
      </xsl:if>
   
      <xsl:if test="@fixes-bug">
  -    <xsl:text> Fixes </xsl:text>
  -    <xsl:choose>
  -     <xsl:when test="contains(@fixes-bug, ',')">
  -      <link href="{$buglist}{translate(normalize-space(@fixes-bug),' ','')}">
  -       <xsl:text>bugs </xsl:text><xsl:value-of select="normalize-space(@fixes-bug)"/>
  -      </link>
  +     <xsl:text> Fixes </xsl:text>
  +     <xsl:call-template name="print-bugs">
  +       <xsl:with-param name="buglist" select="translate(normalize-space(@fixes-bug),' ','')"/>
  +     </xsl:call-template>
  +     <!--
  +     <xsl:choose>
  +       <xsl:when test="contains(@fixes-bug, ',')">
  +         <!-<link href="{$bugtracking-url}{translate(normalize-space(@fixes-bug),' ','')}">->
  +           <link href="{$bugtracking-url}">
  +             <xsl:text>bugs </xsl:text><xsl:value-of select="normalize-space(@fixes-bug)"/>
  +           </link>
  +         </xsl:when>
  +         <xsl:otherwise>
  +           <link href="{$bugtracking-url}{@fixes-bug}">
  +             <xsl:text>bug </xsl:text><xsl:value-of select="@fixes-bug"/>
  +           </link>
  +         </xsl:otherwise>
  +       </xsl:choose>
  +       -->
  +       <xsl:text>.</xsl:text>
  +     </xsl:if>
  +   </li>
  + </xsl:template>
  +
  + <!-- Print each bug id in a comma-separated list -->
  + <xsl:template name="print-bugs">
  +   <xsl:param name="buglist"/>
  +   <xsl:choose>
  +     <xsl:when test="contains($buglist, ',')">
  +       <xsl:variable name="current" select="substring-before($buglist, ',')"/>
  +       <link href="{concat($bugtracking-url, $current)}">
  +         <xsl:value-of select="$current"/>
  +       </link>
  +       <xsl:text>, </xsl:text>
  +       <xsl:call-template name="print-bugs">
  +         <xsl:with-param name="buglist" select="substring-after($buglist, ',')"/>
  +       </xsl:call-template>
        </xsl:when>
        <xsl:otherwise>
  -      <link href="{$bugtracking-url}{@fixes-bug}">
  -       <xsl:text>bug </xsl:text><xsl:value-of select="@fixes-bug"/>
  -      </link>
  +       <link href="{concat($bugtracking-url, $buglist)}"><xsl:value-of select="$buglist"/></link>
        </xsl:otherwise>
  -    </xsl:choose>
  -    <xsl:text>.</xsl:text>
  -   </xsl:if>
  -  </li>
  +   </xsl:choose>
    </xsl:template>
   
   </xsl:stylesheet>
  
  
  
  No                   revision
  No                   revision
  1.213.2.3 +4 -1      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.213.2.2
  retrieving revision 1.213.2.3
  diff -u -r1.213.2.2 -r1.213.2.3
  --- status.xml	21 Sep 2003 09:14:59 -0000	1.213.2.2
  +++ status.xml	21 Sep 2003 09:29:15 -0000	1.213.2.3
  @@ -25,6 +25,9 @@
   
     <changes>
       <release version="0.6-dev" date="unreleased">
  +      <action dev="JT" type="fix" context="skins">
  +        Fixed URLs for comma-separated bug keys in status.xml
  +      </action>
         <action dev="JT" type="fix" context="shbat" fixes-bug="FOR-47, FOR-48">
           Fix bugs in forrest.bat|sh scripts encountered when used in
           odd environments (perl and Win9x).