Changeset 2019

Show
Ignore:
Timestamp:
01/12/09 14:38:08
Author:
douglm
Message:

Better reporting of syntactic errors in filters.

Try to catch those errors early - at update of folder/subscription etc.

Added processing of error codes to xsl.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/default/default/errors.xsl

    r1927 r2019  
    2525        Error: already a member: <em><xsl:value-of select="param"/></em> 
    2626      </xsl:when> 
    27       <xsl:when test="id='org.bedework.client.error.badfilter'"> 
    28         Error: invalid filter definition: <em><xsl:value-of select="param"/></em> 
    29       </xsl:when> 
    3027      <xsl:when test="id='org.bedework.client.error.badinterval'"> 
    3128        Error: bad interval. 
    …… 
    155152          Event <xsl:value-of select="param"/> does not exist. 
    156153      </xsl:when> 
    157       <xsl:when test="id='org.bedework.client.error.unknown.filter'"> 
    158         Error: unknown filter:  <em><xsl:value-of select="param"/></em>. 
    159       </xsl:when> 
    160154      <xsl:when test="id='org.bedework.client.error.unknown.group'"> 
    161155        Error: unknown group:  <em><xsl:value-of select="param"/></em>. 
    …… 
    320314 
    321315      <!--         End of scheduling            --> 
     316 
     317      <!--             Filters            --> 
     318 
     319      <xsl:when test="id='org.bedework.client.error.badfilter'"> 
     320        Error: invalid filter definition: <em><xsl:value-of select="param"/></em> 
     321      </xsl:when> 
     322      <xsl:when test="id='org.bedework.client.error.unknown.filter'"> 
     323        Error: unknown filter:  <em><xsl:value-of select="param"/></em>. 
     324      </xsl:when> 
     325      <xsl:when test="id='org.bedework.exception.filter.unexpected.eof'"> 
     326        Filter error: Unexpected eof while parsing 
     327      </xsl:when> 
     328      <xsl:when test="id='org.bedework.exception.filter.expected.word'"> 
     329        Filter error: expected a word found <em><xsl:value-of select="param"/></em>. 
     330      </xsl:when> 
     331      <xsl:when test="id='org.bedework.exception.filter.expected.openparen'"> 
     332        Filter error: expected open paren 
     333      </xsl:when> 
     334      <xsl:when test="id='org.bedework.exception.filter.mixedlogicaloperators'"> 
     335        Filter error: Cannot mix logical operators 
     336      </xsl:when> 
     337      <xsl:when test="id='org.bedework.exception.filter.unknown.property'"> 
     338        Filter error: unknown property <em><xsl:value-of select="param"/></em>. 
     339      </xsl:when> 
     340      <xsl:when test="id='org.bedework.exception.filter.badproperty'"> 
     341        Filter error: Bad property value <em><xsl:value-of select="param"/></em>. 
     342      </xsl:when> 
     343      <xsl:when test="id='org.bedework.exception.filter.badoperator'"> 
     344        Filter error: Bad operator <em><xsl:value-of select="param"/></em>. 
     345      </xsl:when> 
     346      <xsl:when test="id='org.bedework.exception.filter.syntax'"> 
     347        Filter error: Syntax error 
     348      </xsl:when> 
     349      <xsl:when test="id='org.bedework.exception.filter.typeneedsand'"> 
     350        Filter error: Type requires andop 
     351      </xsl:when> 
     352      <xsl:when test="id='org.bedework.exception.filter.badtype'"> 
     353        Filter error: Bad type value <em><xsl:value-of select="param"/></em>. 
     354      </xsl:when> 
     355      <xsl:when test="id='org.bedework.exception.filter.typefirst'"> 
     356        Filter error: Type must come first 
     357      </xsl:when> 
     358 
     359      <!--         End of filters            --> 
    322360 
    323361      <!-- Other error codes defined in CalfacadeException --> 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2017 r2019  
    34543454          <th>Filter Expression:</th> 
    34553455          <td> 
    3456             <input type="text" name="calendar.filterExpr" value="" size="40"/> 
     3456            <input type="text" name="fexpr" value="" size="40"/> 
    34573457          </td> 
    34583458        </tr> 
    …… 
    35913591          <th>Filter Expression:</th> 
    35923592          <td> 
    3593             <input type="text" name="calendar.filterExpr" value="" size="40"> 
     3593            <input type="text" name="fexpr" value="" size="40"> 
    35943594              <xsl:attribute name="value"><xsl:value-of select="filterExpr"/></xsl:attribute> 
    35953595            </input> 
    …… 
    45394539          <th>Filter Expression:</th> 
    45404540          <td> 
    4541             <input type="text" name="calendar.filterExpr" value="" size="40"/> 
     4541            <input type="text" name="fexpr" value="" size="40"/> 
    45424542          </td> 
    45434543        </tr> 

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

    r2018 r2019  
    46764676          <th>Filter Expression:</th> 
    46774677          <td> 
    4678             <input type="text" name="calendar.filterExpr" value="" size="40"/> 
     4678            <input type="text" name="fexpr" value="" size="40"/> 
    46794679          </td> 
    46804680        </tr> 
    …… 
    48394839          <th>Filter Expression:</th> 
    48404840          <td> 
    4841             <input type="text" name="calendar.filterExpr" value="" size="40"> 
     4841            <input type="text" name="fexpr" value="" size="40"> 
    48424842              <xsl:attribute name="value"><xsl:value-of select="filterExpr"/></xsl:attribute> 
    48434843            </input>