mcardle 2006/01/06 16:31:24 CET
Modified files:
src/view/jsp/include header.inc
Log:
* ESI page invalidate error handling
Revision Changes Path
1.15 +4 -6
corporate_portal_templates/src/view/jsp/include/header.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/header.inc.diff?r1=1.14&r2=1.15&f=h
Index: header.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/header.inc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- header.inc 4 Jan 2006 03:22:25 -0000 1.14
+++ header.inc 6 Jan 2006 15:31:23 -0000 1.15
@@ -7,7 +7,6 @@
<%@ include file="filters.inc"%>
<%@ include file="site_settings.inc"%>
<%@ include file="globals.inc"%>
-<%logger.debug("-- new request
-------------------------------------------");%>
<title><logic:notEmpty name="titlePrefix"><bean:write name="titlePrefix"
filter="false"/> - </logic:notEmpty><jahia:currentPageTitle/> </title>
<%
String contentTypeStr = "iso-8859-1";
@@ -149,6 +148,9 @@
}
document.write("Invalidating cache for this page...");
}
+ else {
+ document.write("The current URL["+theUrl+"] already contains
["+invEsiMarker+"] when it shouldn't");
+ }
window.location.href = theUrl;
}
@@ -164,9 +166,6 @@
theUrl = theUrl.replace(/\?esi=invalidateNow/gi,"");
theUrl = theUrl.replace(/&esi=invalidateNow/gi,"");
theUrl = theUrl.replace(/esi=invalidateNow/gi,"");
- //theUrl.replace("\\?"+invEsiMarker,"");
- //theUrl.replace("&"+invEsiMarker,"");
- //theUrl.replace(invEsiMarker,"");
window.location.href = theUrl;
}
}
@@ -191,7 +190,6 @@
if (esiInvParam!=null &&
esiInvParam.equalsIgnoreCase("invalidateNow")
&& isFragmentRequested==null) {
//invalidate page and all its fragments
- System.err.println("------ invalidting now");
EsiSOAPInvalidation.SOAPInvalidatePageAndAllFrags(jData.params(),
jData.params().getPageID() );
%><script>
<!--
@@ -244,7 +242,7 @@
<tr>
<td align="right" valign="top">
<form name="searchForm" method="post"
action="<%=jData.gui().html().drawSearchLauncher()%>"
onSubmit="checkMaxPageItems(document.searchForm)" >
- <input type="text" name="search"
value="<%=JahiaTools.text2html(JahiaTools.getStrParameter(request,"search",""))%>"
/> <a
href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.submit()"><img
src="<jahia:contextURL/>/images/search.gif" alt="<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="search"/>" width="15" height="15" border="0" align="middle"/></a>
+ <input type="text" name="search"
value='<%=JahiaTools.getStrParameter(request,"search","")%>' /> <a
href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.submit()"><img
src="<jahia:contextURL/>/images/search.gif" alt="<jahia:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
resourceName="search"/>" width="15" height="15" border="0" align="middle"/></a>
<input type="hidden" name="maxPageItems" value="10"
/><br>> <a
href="javascript:checkMaxPageItems(document.searchForm);setFreeSearchInput(document.searchForm);document.searchForm.searchView.value='advSearch';document.searchForm.submit()">Advanced
search</a>
<input type="hidden"
name="<%=PageSearchResultBuilderImpl.ONE_HIT_BY_PAGE_PARAMETER_NAME%>"
value="false" />
<input type="hidden" name="searchView"
value="simple" />
