Changeset 343

Show
Ignore:
Timestamp:
04/07/06 14:48:12
Author:
johnsa
Message:

removing count() tests from xslt in favor of more efficient tag existence checks.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r342 r343  
    479479                              (/bedework/periodname='Month' and 
    480480                              (/bedework/appvar[key='monthViewMode']/value='cal' or 
    481                                count(/bedework/appvar[key='monthViewMode'])=0)) or 
     481                               not(/bedework/appvar[key='monthViewMode']))) or 
    482482                              (/bedework/periodname='Week' and 
    483483                              (/bedework/appvar[key='weekViewMode']/value='cal' or 
    484                                count(/bedework/appvar[key='weekViewMode'])=0))"> 
     484                               not(/bedework/appvar[key='weekViewMode'])))"> 
    485485                <xsl:choose> 
    486486                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    …… 
    643643    <table id="listTable" border="0" cellpadding="0" cellspacing="0"> 
    644644      <xsl:choose> 
    645         <xsl:when test="count(/bedework/eventscalendar/year/month/week/day/event)=0"> 
     645        <xsl:when test="not(/bedework/eventscalendar/year/month/week/day/event)"> 
    646646          <tr> 
    647647            <td class="noEventsCell"> 
    …… 
    662662        </xsl:when> 
    663663        <xsl:otherwise> 
    664           <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[count(event)!=0]"> 
     664          <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event]"> 
    665665            <xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''"> 
    666666              <tr> 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r342 r343  
    547547                              (/bedework/periodname='Month' and 
    548548                              (/bedework/appvar[key='monthViewMode']/value='cal' or 
    549                                count(/bedework/appvar[key='monthViewMode'])=0)) or 
     549                               not(/bedework/appvar[key='monthViewMode']))) or 
    550550                              (/bedework/periodname='Week' and 
    551551                              (/bedework/appvar[key='weekViewMode']/value='cal' or 
    552                                count(/bedework/appvar[key='weekViewMode'])=0))"> 
     552                               not(/bedework/appvar[key='weekViewMode'])))"> 
    553553                <xsl:choose> 
    554554                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    …… 
    585585    <table id="listTable" border="0" cellpadding="0" cellspacing="0"> 
    586586      <xsl:choose> 
    587         <xsl:when test="count(/bedework/eventscalendar/year/month/week/day/event)=0"> 
     587        <xsl:when test="not(/bedework/eventscalendar/year/month/week/day/event)"> 
    588588          <tr> 
    589589            <td class="noEventsCell"> 
    …… 
    604604        </xsl:when> 
    605605        <xsl:otherwise> 
    606           <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[count(event)!=0]"> 
     606          <xsl:for-each select="/bedework/eventscalendar/year/month/week/day[event]"> 
    607607            <xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''"> 
    608608              <tr>