Changeset 8271

Show
Ignore:
Timestamp:
03/05/10 16:43:12 (5 months ago)
Author:
dragisak
Message:

Instead of using site error page, create new search error page.

Location:
head/ambra/webapp/src/main
Files:
2 modified
1 copied

Legend:

Unmodified
Added
Removed

  • head/ambra/webapp/src/main/resources/struts.xml

    r8245 r8271  
    221221  </package> 
    222222 
     223  <!-- 
     224    OLD SEARCH 
     225    TODO: remove 
     226  --> 
    223227  <package name="search" extends="default" namespace="/search2"> 
    224228 
    … …  
    259263 
    260264  <!-- 
    261     Copy of the "search" package to act as a starting point for re-engineering the search functionality. 
     265    Solr search 
    262266  --> 
    263267  <package name="search2" extends="default" namespace="/search"> 
    … …  
    278282        <param name="templateFile">/search2/searchResults.ftl</param> 
    279283      </result> 
    280       <result name="badquery" type="ambraFreemarker"> 
     284      <result name="error" type="ambraFreemarker"> 
    281285        <param name="status">500</param> 
    282         <param name="templateFile">/static/searchParseError.ftl</param> 
     286        <param name="templateFile">/static/searchError.ftl</param> 
    283287      </result> 
    284288    </action> 
    … …  
    291295        <param name="templateFile">/search2/searchResults.ftl</param> 
    292296      </result> 
    293       <result name="badquery" type="ambraFreemarker"> 
     297      <result name="error" type="ambraFreemarker"> 
    294298        <param name="status">500</param> 
    295         <param name="templateFile">/static/searchParseError.ftl</param> 
     299        <param name="templateFile">/static/searchError.ftl</param> 
    296300      </result> 
    297301    </action> 

  • head/ambra/webapp/src/main/webapp/static/searchError.ftl

    r7658 r8271  
    33  $Id$ 
    44 
    5   Copyright (c) 2007-2009 by Topaz, Inc. 
     5  Copyright (c) 2007-2010 by Topaz, Inc. 
    66  http://topazproject.org 
    77 
    … …  
    2121  <@s.url action="searchHelp.action" namespace="/static" includeParams="none" id="searchHelp"/> 
    2222  <h1>Search Error</h1> 
    23   <p>Sorry, the query you entered could not be parsed.  Please press the back button and 
    24     check your syntax.  If you need additional help, please visit our 
     23  <p>Sorry, search results are not available at the moment. Please try again soon.</p> 
     24  <p>If you need additional help, please visit our 
    2525    <a href="${searchHelp}#badCharacters">search help</a> page.</p> 
    2626</div> 

  • head/ambra/webapp/src/main/webapp/static/searchParseError.ftl

    r7658 r8271  
    1818  limitations under the License. 
    1919--> 
     20<!-- TODO: Old search error page. Remove. --> 
    2021<div id="content" class="pageerror"> 
    2122  <@s.url action="searchHelp.action" namespace="/static" includeParams="none" id="searchHelp"/>