Author: tdraier
Date: Mon Aug 27 19:19:40 2007
New Revision: 770
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D770&repname=
=3Dcorporate_portal_templates_v2
Log:
fixes for jackrabbit search
Modified:
trunk/src/jsp/searchresult.jsp
Modified: trunk/src/jsp/searchresult.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/jsp/searchr=
esult.jsp&rev=3D770&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/jsp/searchresult.jsp (original)
+++ trunk/src/jsp/searchresult.jsp Mon Aug 27 19:19:40 2007
@@ -128,10 +128,10 @@
}
=
=
- SearchViewHandlerImpl searchViewHandler =3D null;
- searchViewHandler =3D
(SearchViewHandlerImpl)engineMap.get(Search_Engine.=
SEARCH_HANDLER);
+ AdvSearchViewHandler searchViewHandler =3D null;
+ searchViewHandler =3D
(AdvSearchViewHandler)engineMap.get(Search_Engine.S=
EARCH_HANDLER);
if ( searchViewHandler =3D=3D null ){
- searchViewHandler =3D new SearchViewHandlerImpl();
+ searchViewHandler =3D new AdvSearchViewHandler();
if ( "advSearch".equals(searchView) ){
searchViewHandler.setName("default");
} else {
@@ -158,7 +158,7 @@
}
engineMap.put("searchResults",searchResults);
=
- searchViewHandler.getDomains().toArray(searchDomains);
+
searchViewHandler.getWebSiteSearchDelegate().getDomains().toArray(search=
Domains);
=
}
=
@@ -392,7 +392,7 @@
<TR>
<TD><FONT size=3D-1>
<SELECT name=3D"searchDomain">
- <OPTION value=3D"anywhere" <%if (searchViewHandler.=
getDomains().size()=3D=3D0||searchViewHandler.getDomains().contains("anywhe=
re")){%>selected<%}%>>Anywhere
+ <OPTION value=3D"anywhere" <%if (searchViewHandler.=
getWebSiteSearchDelegate().getDomains().size()=3D=3D0||searchViewHandler.ge=
tWebSiteSearchDelegate().getDomains().contains("anywhere")){%>selected<%}%>=
>Anywhere
<%
Map searchHandlers =3D ServicesRegistry.getInstance()=
.getJahiaSearchService().getSearchManager().getSearchHandlers();
Iterator it =3D
searchHandlers.values().iterator();
@@ -401,7 +401,7 @@
searchHandler =3D
(SearchHandler)it.next();
if (
!"default".equals(searchHandler.getName()) ){
%>
- <OPTION
value=3D"<%=3DsearchHandler.getName()%>" <% =
if (searchViewHandler.getDomains().contains(searchHandler.getName())){%>sel=
ected<%}%>>site : <%=3DsearchHandler.getTitle()%>
+ <OPTION
value=3D"<%=3DsearchHandler.getName()%>" <% =
if (searchViewHandler.getWebSiteSearchDelegate().getDomains().contains(sear=
chHandler.getName())){%>selected<%}%>>site : <%=3DsearchHandler.getTitle()%>
<%
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
