mcardle 2005/08/31 12:07:21 CEST
Modified files:
src/view/jsp searchresult.jsp sitemap.jsp
Log:
removed ESI caching
Revision Changes Path
1.22 +86 -96 corporate_portal_templates/src/view/jsp/searchresult.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/searchresult.jsp.diff?r1=1.21&r2=1.22&f=h
1.13 +0 -12 corporate_portal_templates/src/view/jsp/sitemap.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/sitemap.jsp.diff?r1=1.12&r2=1.13&f=h
Index: searchresult.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/searchresult.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- searchresult.jsp 26 Aug 2005 15:13:55 -0000 1.21
+++ searchresult.jsp 31 Aug 2005 10:07:21 -0000 1.22
@@ -1,9 +1,4 @@
-<%@ taglib uri="/WEB-INF/tld/jesi-tags" prefix="jesi" %>
-<jesi:template cache="yes">
-
-
<%@ include file="include/header.inc"%>
-<jesi:fragment cache="yes">
<%@ page import="org.jahia.data.search.*" %>
<%@ page import="org.jahia.engines.search.*" %>
<%@ page import="org.jahia.services.search.*" %>
@@ -40,19 +35,19 @@
searchString = removeTags(searchString);
String searchView = (String)request.getParameter("searchView");
-
+
StringBuffer advOptions = new StringBuffer();
String updateDate = "";
String occurence = "";
String contentType = "";
String occurenceField = "";
String[] searchDomains = new String[]{};
-
+
if ( searchView == null ){
searchView = "simple";
} else {
// adv search form submit
-
+
// max update date range
updateDate =
JahiaTools.getStrParameter(request,"updateDate","anytime");
if ( !"anytime".equals(updateDate) ){
@@ -60,13 +55,13 @@
cal.setTimeZone(TimeZone.getTimeZone("UTC"));
cal.setTime(new Date());
- Date maxUpdateDate = getUpdateDateRange(updateDate);
- advOptions.append("(");
- advOptions.append("lastmodifdate:[");
-
advOptions.append(NumberPadding.pad(maxUpdateDate.getTime()));
- advOptions.append(" TO ");
-
advOptions.append(NumberPadding.pad(cal.getTime().getTime()));
- advOptions.append("])");
+ Date maxUpdateDate = getUpdateDateRange(updateDate);
+ advOptions.append("(");
+ advOptions.append("lastmodifdate:[");
+
advOptions.append(NumberPadding.pad(maxUpdateDate.getTime()));
+ advOptions.append(" TO ");
+
advOptions.append(NumberPadding.pad(cal.getTime().getTime()));
+ advOptions.append("])");
}
// occurence
@@ -78,36 +73,36 @@
boolean closeClause = false;
if ( "title".equals(occurence) ||
"author".equals(occurence) || "contributor".equals(occurence) ) {
if ( advOptions.length()>0 ){
- advOptions.append(" AND (");
+ advOptions.append(" AND (");
} else {
- advOptions.append("(");
+ advOptions.append("(");
}
closeClause = true;
}
if ( "title".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("title");
- } else if ( "author".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("creator");
- } else if ( "file.title".equals(occurence) ){
+ advOptions.append("fieldname:");
+ advOptions.append("title");
+ } else if ( "author".equals(occurence) ){
+ advOptions.append("fieldname:");
+ advOptions.append("creator");
+ } else if ( "file.title".equals(occurence) ){
occurenceField = "file_property_title";
- } else if ( "file.subject".equals(occurence) ){
+ } else if ( "file.subject".equals(occurence) ){
occurenceField = "file_property_subject";
- } else if ( "file.comments".equals(occurence) ){
+ } else if ( "file.comments".equals(occurence) ){
occurenceField = "file_property_comments";
- } else if ( "file.keywords".equals(occurence) ){
+ } else if ( "file.keywords".equals(occurence) ){
occurenceField = "file_property_keywords";
- } else if ( "file.author".equals(occurence) ){
+ } else if ( "file.author".equals(occurence) ){
occurenceField = "file_property_author";
- } else if ( "contributor".equals(occurence) ){
- advOptions.append("fieldname:");
- advOptions.append("lastContributor");
- } else if ( "file.contributor".equals(occurence) ){
+ } else if ( "contributor".equals(occurence) ){
+ advOptions.append("fieldname:");
+ advOptions.append("lastContributor");
+ } else if ( "file.contributor".equals(occurence) ){
occurenceField = "file_property_lastauthor";
- }
+ }
if ( closeClause ) {
- advOptions.append(")");
+ advOptions.append(")");
}
}
@@ -115,28 +110,28 @@
contentType =
JahiaTools.getStrParameter(request,"contentType","any");
if ( !"any".equals(contentType) ){
if ( advOptions.length()>0 ){
- advOptions.append(" AND (");
+ advOptions.append(" AND (");
} else {
- advOptions.append("(");
+ advOptions.append("(");
}
if ( "pdf".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_pdf");
- } else if ( "doc".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_msword");
- } else if ( "xls".equals(contentType) ){
- advOptions.append("content_type:");
- advOptions.append("application_vnd.ms-excel");
- } else if ( "ppt".equals(contentType) ){
- advOptions.append("content_type:");
-
advOptions.append("application_vnd.ms-powerpoint");
- }
- advOptions.append(")");
+ advOptions.append("content_type:");
+ advOptions.append("application_pdf");
+ } else if ( "doc".equals(contentType) ){
+ advOptions.append("content_type:");
+ advOptions.append("application_msword");
+ } else if ( "xls".equals(contentType) ){
+ advOptions.append("content_type:");
+ advOptions.append("application_vnd.ms-excel");
+ } else if ( "ppt".equals(contentType) ){
+ advOptions.append("content_type:");
+
advOptions.append("application_vnd.ms-powerpoint");
+ }
+ advOptions.append(")");
}
-
+
}
-
+
SearchViewHandlerImpl searchViewHandler = null;
searchViewHandler =
(SearchViewHandlerImpl)engineMap.get(Search_Engine.SEARCH_HANDLER);
if ( searchViewHandler == null ){
@@ -155,7 +150,7 @@
newQuery = "(" + newQuery + ") AND (" +
advOptions.toString() + ")";
}
if ( !"".equals(occurenceField) && !"".equals(newQuery) ){
- newQuery = occurenceField + ":(" + newQuery + ")";
+ newQuery = occurenceField + ":(" + newQuery + ")";
}
searchViewHandler.setQuery(newQuery);
@@ -163,7 +158,7 @@
if ( searchResults == null ){
searchResults = new JahiaSearchResult(new
PageSearchResultBuilderImpl());
- }
+ }
engineMap.put("searchResults",searchResults);
searchViewHandler.getDomains().toArray(searchDomains);
@@ -171,7 +166,7 @@
}
int totalHits = searchResults.getHitCount();
-
+
int maxPageItems = 3;
String val = (String)request.getParameter("maxPageItems");
if ( val != null ){
@@ -203,7 +198,7 @@
function submitSearchPagerForm() {
var index = document.advSearchForm.maxPageItems.selectedIndex;
if ( index != -1 ){
- document.searchpager.maxPageItems.value =
+ document.searchpager.maxPageItems.value =
document.advSearchForm.maxPageItems.options[index].value;
}
document.searchpager.submit();
@@ -228,7 +223,7 @@
<input type="hidden" name="contentType" value="<%=contentType%>" />
<%
for ( int i=0; i<searchDomains.length; i++ ){
- %>
+ %>
<input type="hidden" name="searchDomain"
value="<%=searchDomains[i]%>" />
<% } %>
</form>
@@ -254,7 +249,7 @@
<TABLE cellSpacing=0 cellPadding=2 width="100%">
<TBODY>
<TR>
- <TD vAlign=top width="15%"><FONT size=-1><BR><B>Find results
+ <TD vAlign=top width="15%"><FONT size=-1><BR><B>Find results
</B></FONT></TD>
<TD width="85%">
<TABLE cellSpacing=0 cellPadding=2 width="100%" border="0">
@@ -265,7 +260,7 @@
</TR>
<TR>
<TD><FONT size=-1>with <B>all</B> of the
words</FONT></TD>
- <TD><INPUT size=25
value="<%=searchViewHandler.getAllWord()%>"
+ <TD><INPUT size=25
value="<%=searchViewHandler.getAllWord()%>"
name="allWordSearch" >
</TD>
<TD vAlign=top rowSpan=4><FONT size=-1>
@@ -276,18 +271,18 @@
<option class="input"
value="50" <%if (maxPageItems==50){%>selected<%}%>>50
<option class="input"
value="100" <%if (maxPageItems==100){%>selected<%}%>>100
</select>
- <INPUT type=hidden value=en
+ <INPUT type=hidden value=en
name=hl><span class="text"> <a
href="javascript:document.advSearchForm.submit()">Adv.
Search</a></span></FONT></TD></TR>
<TR>
- <TD noWrap><FONT size=-1>with the <B>exact
+ <TD noWrap><FONT size=-1>with the <B>exact
phrase</B></FONT></TD>
<TD><INPUT size=25 name="exactPhraseSearch"
value="<%=searchViewHandler.getExactPhrase()%>"></TD></TR>
<TR>
- <TD noWrap><FONT size=-1>with <B>at least one</B> of
the
+ <TD noWrap><FONT size=-1>with <B>at least one</B> of
the
words</FONT></TD>
<TD><INPUT size=25 name="oneOfWordSearch"
value="<%=searchViewHandler.getOneOfWord()%>"></TD></TR>
<TR>
- <TD noWrap><FONT size=-1><B>without</B> the
+ <TD noWrap><FONT size=-1><B>without</B> the
words</FONT></TD>
<TD><INPUT size=25 name="withoutWordSearch"
value="<%=searchViewHandler.getWithoutWord()%>"></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></TD></TR>
<!--
@@ -297,29 +292,29 @@
<TBODY>
<TR>
<TD width="15%"><FONT size=-1><B>Language</B></FONT></TD>
- <TD width="40%"><FONT size=-1>Return pages written
+ <TD width="40%"><FONT size=-1>Return pages written
in</FONT></TD>
- <TD><FONT size=-1><SELECT name=lr><OPTION value=""
- selected>any language<OPTION value=lang_ar>Arabic<OPTION
- value=lang_bg>Bulgarian<OPTION
value=lang_ca>Catalan<OPTION
- value=lang_zh-CN>Chinese (Simplified)<OPTION
- value=lang_zh-TW>Chinese (Traditional)<OPTION
- value=lang_hr>Croatian<OPTION value=lang_cs>Czech<OPTION
- value=lang_da>Danish<OPTION value=lang_nl>Dutch<OPTION
- value=lang_en>English<OPTION
value=lang_et>Estonian<OPTION
- value=lang_fi>Finnish<OPTION value=lang_fr>French<OPTION
- value=lang_de>German<OPTION value=lang_el>Greek<OPTION
- value=lang_iw>Hebrew<OPTION
value=lang_hu>Hungarian<OPTION
- value=lang_is>Icelandic<OPTION
- value=lang_id>Indonesian<OPTION
value=lang_it>Italian<OPTION
- value=lang_ja>Japanese<OPTION
value=lang_ko>Korean<OPTION
- value=lang_lv>Latvian<OPTION
value=lang_lt>Lithuanian<OPTION
- value=lang_no>Norwegian<OPTION
value=lang_pl>Polish<OPTION
- value=lang_pt>Portuguese<OPTION
- value=lang_ro>Romanian<OPTION
value=lang_ru>Russian<OPTION
- value=lang_sr>Serbian<OPTION value=lang_sk>Slovak<OPTION
- value=lang_sl>Slovenian<OPTION
value=lang_es>Spanish<OPTION
- value=lang_sv>Swedish<OPTION
+ <TD><FONT size=-1><SELECT name=lr><OPTION value=""
+ selected>any language<OPTION value=lang_ar>Arabic<OPTION
+ value=lang_bg>Bulgarian<OPTION
value=lang_ca>Catalan<OPTION
+ value=lang_zh-CN>Chinese (Simplified)<OPTION
+ value=lang_zh-TW>Chinese (Traditional)<OPTION
+ value=lang_hr>Croatian<OPTION value=lang_cs>Czech<OPTION
+ value=lang_da>Danish<OPTION value=lang_nl>Dutch<OPTION
+ value=lang_en>English<OPTION
value=lang_et>Estonian<OPTION
+ value=lang_fi>Finnish<OPTION value=lang_fr>French<OPTION
+ value=lang_de>German<OPTION value=lang_el>Greek<OPTION
+ value=lang_iw>Hebrew<OPTION
value=lang_hu>Hungarian<OPTION
+ value=lang_is>Icelandic<OPTION
+ value=lang_id>Indonesian<OPTION
value=lang_it>Italian<OPTION
+ value=lang_ja>Japanese<OPTION value=lang_ko>Korean<OPTION
+ value=lang_lv>Latvian<OPTION
value=lang_lt>Lithuanian<OPTION
+ value=lang_no>Norwegian<OPTION
value=lang_pl>Polish<OPTION
+ value=lang_pt>Portuguese<OPTION
+ value=lang_ro>Romanian<OPTION
value=lang_ru>Russian<OPTION
+ value=lang_sr>Serbian<OPTION value=lang_sk>Slovak<OPTION
+ value=lang_sl>Slovenian<OPTION
value=lang_es>Spanish<OPTION
+ value=lang_sv>Swedish<OPTION
value=lang_tr>Turkish</OPTION></SELECT></FONT></TD></TR></TBODY></TABLE></TD></TR>
-->
<TR bgColor=#ffffff>
@@ -328,7 +323,7 @@
<TBODY>
<TR>
<TD width="15%"><FONT size=-1><B>File Format</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>return results of the
file
+ <TD noWrap width="40%"><FONT size=-1>return results of the
file
format</FONT></TD>
<TD><FONT size=-1>
<SELECT name="contentType">
@@ -344,7 +339,7 @@
<TBODY>
<TR>
<TD width="15%"><FONT size=-1><B>Date</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>Return documents
updated
+ <TD noWrap width="40%"><FONT size=-1>Return documents updated
in the </FONT></TD>
<TD><FONT size=-1>
<SELECT name="updateDate">
@@ -361,7 +356,7 @@
<TBODY>
<TR bgColor=#ffffff>
<TD width="15%"><FONT size=-1><B>Occurrences</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1>Return results where my
+ <TD noWrap width="40%"><FONT size=-1>Return results where my
terms occur</FONT></TD>
<TD><FONT size=-1>
<SELECT name="occurence">
@@ -383,9 +378,9 @@
<TBODY>
<TR>
<TD width="15%"><FONT size=-1><B>Domain</B></FONT></TD>
- <TD noWrap width="40%"><FONT size=-1><!--<SELECT
- name=as_dt><OPTION value=i selected>Only<OPTION
- value=e>Don't</OPTION></SELECT>--> return results from
the site
+ <TD noWrap width="40%"><FONT size=-1><!--<SELECT
+ name=as_dt><OPTION value=i selected>Only<OPTION
+ value=e>Don't</OPTION></SELECT>--> return results from
the site
or domain</FONT></TD>
<TD>
<TABLE cellSpacing=0 cellPadding=0>
@@ -394,7 +389,7 @@
<TD><FONT size=-1>
<SELECT name="searchDomain">
<OPTION value="anywhere" <%if
(searchViewHandler.getDomains().size()==0||searchViewHandler.getDomains().contains("anywhere")){%>selected<%}%>>Anywhere
- <%
+ <%
Map searchHandlers =
ServicesRegistry.getInstance().getJahiaSearchService().getSearchManager().getSearchHandlers();
Iterator it =
searchHandlers.values().iterator();
SearchHandler searchHandler = null;
@@ -430,7 +425,7 @@
<pg:param name="contentType" value="<%=contentType%>" />
<%
for ( int i=0; i<searchDomains.length; i++ ){
-%>
+%>
<pg:param name="searchDomain" value="<%=searchDomains[i]%>" />
<% } %>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
@@ -489,11 +484,6 @@
</tr>
</table>
</pg:pager>
-</jesi:fragment>
-<jesi:fragment cache="yes" group="footer_banner" > <esi:comment text="This
fragment will be shared across all users" />
<%@ include file="include/footer.inc"%>
-</jesi:fragment>
-
-</jesi:template >
Index: sitemap.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/sitemap.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sitemap.jsp 26 Aug 2005 15:13:55 -0000 1.12
+++ sitemap.jsp 31 Aug 2005 10:07:21 -0000 1.13
@@ -1,9 +1,4 @@
-<%@ taglib uri="/WEB-INF/tld/jesi-tags" prefix="jesi" %>
-<jesi:template cache="yes">
-
-
<%@ include file="include/header.inc"%>
-<jesi:fragment cache="yes">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="maintable10">
@@ -13,11 +8,4 @@
</td>
</tr>
</table>
-</jesi:fragment>
-
-
-<jesi:fragment cache="yes" group="footer_banner" > <esi:comment text="This
fragment will be shared across all users" />
<%@ include file="include/footer.inc"%>
-</jesi:fragment>
-
-</jesi:template >
