Author: ssmiweve Date: 2008-02-21 13:43:15 +0100 (Thu, 21 Feb 2008) New Revision: 6158
Modified: branches/2.16.0/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java Log: (11:11:58) Endre Midtg?\195?\165rd Meckelborg: DEBUG 11:06:47,565 [localhost:8080/ http-8080-Processor45] (0440c022-3fc0-4be2-bd75-c2d6a9abd63e) AbstractVelocityTemplateTag: Unable to find resource 'http://localhost:8080/localhost/templates//pages/oldHttpDecorator.jsp.vm' (11:12:04) Endre Midtg?\195?\165rd Meckelborg: Is this a sesat-thing or genericno-thing? Nothing is rendered with sesat 2.16.0 and 2.16 of genericno. (11:13:45) mck: you can't be really using 2.16.0 (11:13:46) Private conversation with [EMAIL PROTECTED]/Adium started. (11:14:20) mck: i see (11:15:49) mck: that's genericno r13132 (11:16:05) mck: does it actually break anything? (11:16:39) mck: you end up with a blank page? (11:21:17) mck: i would expect that because it is not found it falls back onto httpDecorator.jsp (11:28:33) Endre Midtg?\195?\165rd Meckelborg: I end with a blank page. ... (11:40:13) mck: read http://sesat.no/svn/sesat-kernel/branches/2.16.0/war/src/main/webapp/WEB-INF/jsp/decorators/webDecorator.jsp it has: <search:main/> <c:if test="${!empty Missing_SearchTabMain_Template}"> <%@ include file="httpDecorator.jsp" %> </c:if> (11:41:05) mck: it is <search:main/> that is leading to AbstractVelocityTemplateTag: Unable to find resource 'http://localhost:8080/localhost/templates//pages/oldHttpDecorator.jsp.vm' and as it is not found, then Missing_SearchTabMain_Template is set. so <%@ include file="httpDecorator.jsp" %> should be run. (11:41:26) mck: it there an exception that is preventing <%@ include file="httpDecorator.jsp" %> from being reached? (11:42:06) Endre Midtg?\195?\165rd Meckelborg: <%@ taglib uri="http://java.sun.com/jstl/core_rt"; prefix="c" %> <%@ taglib uri="/WEB-INF/SearchPortal.tld" prefix="search" %> <search:main/> <c:if test="${!empty Missing_SearchTabMain_Template}"> <%@ include file="httpDecorator.jsp" %> </c:if> Modified: branches/2.16.0/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java =================================================================== --- branches/2.16.0/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java 2008-02-21 08:40:27 UTC (rev 6157) +++ branches/2.16.0/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java 2008-02-21 12:43:15 UTC (rev 6158) @@ -83,19 +83,22 @@ ? layout.getFront() : null; - final String include = datamodel.getQuery().getQuery().isBlank() && null != front + String include = datamodel.getQuery().getQuery().isBlank() && null != front ? front : layout.getMain(); if(null != include){ + + include = include.startsWith("/") ? include : PAGES_DIRECTORY + include; final Map<String,Object> map = new HashMap<String,Object>(); map.put("layout", layout); - importTemplate(include.startsWith("/") ? include : PAGES_DIRECTORY + include, map); + importTemplate(include, map); - }else{ + } + if(null == include || Boolean.TRUE == cxt.getAttribute("Missing_" + include.replaceAll("/","") + "_Template")){ // use the default httpDecorator.jsp cxt.setAttribute(MISSING, Boolean.TRUE); } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
