cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java esql.xsl

[tcurdt]

tcurdt      02/02/22 04:14:12

  Modified:    src/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  fixed the normalize-space problem reported by [EMAIL PROTECTED] where all 
nested
  tags were removed from skip-rows/max-rows. this was introduce with the fix for bug 
#4932.
  (still it would be nicer to change the get-nested-content template instead)
  
  Revision  Changes    Path
  1.13      +5 -6      
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- esql.xsl  21 Feb 2002 03:36:09 -0000      1.12
  +++ esql.xsl  22 Feb 2002 12:14:12 -0000      1.13
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<!-- $Id: esql.xsl,v 1.12 2002/02/21 03:36:09 vgritsenko Exp $-->
  +<!-- $Id: esql.xsl,v 1.13 2002/02/22 12:14:12 tcurdt Exp $-->
   <!--
   
    ============================================================================
  @@ -56,7 +56,7 @@
    * ESQL Logicsheet
    *
    * @author ?
  - * @version CVS $Revision: 1.12 $ $Date: 2002/02/21 03:36:09 $
  + * @version CVS $Revision: 1.13 $ $Date: 2002/02/22 12:14:12 $
   -->
   
   <xsl:stylesheet version="1.0"
  @@ -474,17 +474,17 @@
       if (_esql_query != null) {
         _esql_queries.push(_esql_query);
       }
  -    _esql_query = new EsqlQuery( _esql_connection, String.valueOf(<xsl:copy-of 
select="normalize-space($query)"/>) );
  +    _esql_query = new EsqlQuery( _esql_connection, String.valueOf(<xsl:copy-of 
select="$query"/>) );
   
       <xsl:if test="esql:max-rows">
         try {
  -        _esql_query.setMaxRows( Integer.parseInt(String.valueOf(<xsl:copy-of 
select="normalize-space($maxrows)"/>)) );
  +        _esql_query.setMaxRows( Integer.parseInt(String.valueOf(<xsl:copy-of 
select="$maxrows"/>).trim()) );
         } catch (NumberFormatException e) {}
       </xsl:if>
   
       <xsl:if test="esql:skip-rows">
         try {
  -        _esql_query.setSkipRows( Integer.parseInt(String.valueOf(<xsl:copy-of 
select="$skiprows"/>)) );
  +        _esql_query.setSkipRows( Integer.parseInt(String.valueOf(<xsl:copy-of 
select="$skiprows"/>).trim()) );
         } catch (NumberFormatException e) {}
       </xsl:if>
   
  @@ -1227,7 +1227,6 @@
       <xsl:otherwise><xsl:value-of 
select="translate(@type,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/></xsl:otherwise>
     </xsl:choose>
   </xsl:template>
  -
   
   <!--
     Break on error.
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]