Author: tdraier
Date: Tue Nov 6 10:50:51 2007
New Revision: 840
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D840&repname=
=3Dcorporate_portal_templates_v2
Log:
merge jackrabbit integration into new branch
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webdavsear=
ch.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/websitesea=
rch.inc
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearchresult.jsp
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/searchresult.jsp
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webd=
avsearch.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webdavsearch.jsp&rev=3D840&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
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webdavsear=
ch.jsp (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webdavsear=
ch.jsp Tue Nov 6 10:50:51 2007
@@ -29,7 +29,6 @@
<%@ page import=3D"org.jahia.services.webdav.model.*" %>
<%@ page import=3D"org.compass.core.*" %>
<%@ page import=3D"org.jahia.ajax.webdav.DAVAbstractAction"%>
-<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.apache.slide.search.basic.*" %>
<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
=
@@ -120,10 +119,10 @@
if ( documentTitle =3D=3D null ){
documentTitle =3D "";
}
- String documentSubject =3D webdavSearchDelegate.getSubject();
- if ( documentSubject =3D=3D null ){
- documentSubject =3D "";
- }
+// String documentSubject =3D webdavSearchDelegate.getSubject();
+// if ( documentSubject =3D=3D null ){
+// documentSubject =3D "";
+// }
=
String webdavDialogUrl =3D Jahia.getContextPath() + "/jsp/jahia/engines/=
webdav/webdavrepository.jsp?display=3D" + DAVAbstractAction.DIRECTORIES_ONL=
Y;
%>
@@ -222,14 +221,14 @@
</FONT>
</TD>
</TR>
- <TR>
- <TD width=3D"15%"> </TD>
- <TD noWrap width=3D"30%"><FONT size=3D-1><=
content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_portal_te=
mplates_v2" resourceName=3D"search.subject" defaultValue=3D"Subject" /></FO=
NT></TD>
- <TD><FONT size=3D-1>
- <INPUT class=3D"input" size=3D"35" val=
ue=3D"<%=3DdocumentSubject%>" name=3D"documentSubject" >
- </FONT>
- </TD>
- </TR>
+ <%--<TR>--%>
+ <%--<TD width=3D"15%"> </TD>--%>
+ <%--<TD noWrap width=3D"30%"><FONT size=3D=
-1><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate_porta=
l_templates_v2" resourceName=3D"search.subject" defaultValue=3D"Subject" />=
</FONT></TD>--%>
+ <%--<TD><FONT size=3D-1>--%>
+ <%--<INPUT class=3D"input" size=3D"35"=
value=3D"<%=3DdocumentSubject%>" name=3D"documentSubject" >--%>
+ <%--</FONT>--%>
+ <%--</TD>--%>
+ <%--</TR>--%>
<TR bgColor=3D"#ffffff">
<TD height=3D"10px" colspan=3D"2"> </=
TD>
</TR>
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/webs=
itesearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/websitesearch.inc&rev=3D840&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
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/websitesea=
rch.inc (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearch/websitesea=
rch.inc Tue Nov 6 10:50:51 2007
@@ -123,7 +123,7 @@
SearchHandler searchHandler =3D null;
while ( it.hasNext() ){
searchHandler =3D (SearchHandler)it.ne=
xt();
- if ( searchHandler.getName().equals(Ja=
hiaWebdavBaseService.WEBDAV_SEARCH) ){
+ if ( searchHandler.getName().equals(Ja=
hiaSearchBaseService.WEBDAV_SEARCH) ){
continue;
}
if ( !"default".equals(searchHandler.g=
etName()) ){
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearchresul=
t.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/src/jsp/advsearchresult.jsp&rev=3D840&repname=3Dcorpo=
rate_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
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearchresult.jsp =
(original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/advsearchresult.jsp =
Tue Nov 6 10:50:51 2007
@@ -32,6 +32,7 @@
<%@ page import=3D"org.jahia.engines.timebasedpublishing.CalendarHandler" =
%>
<%@ page import=3D"org.jahia.services.search.slide.*" %>
<%@ page import=3D"org.jahia.services.acl.JahiaBaseACL" %>
+<%@ page import=3D"org.jahia.bin.Jahia" %>
=
<jesi:fragment cache=3D"no">
<%
@@ -118,7 +119,7 @@
searchString =3D advSearchViewHandler.getFreeSearch();
=
=
- if ( JahiaWebdavBaseService.getInstance().getEnableSlideSearch() )=
{ %>
+ if ( Jahia.getSettings().isJcrSearchEnabled() ){ %>
<div id=3D"menubar">
<ul id=3D"floatright_tabs">
<li class=3D"tabs_li">
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/searchresult.j=
sp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/src/jsp/searchresult.jsp&rev=3D840&repname=3Dcorporat=
e_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
--- branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/searchresult.jsp (or=
iginal)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/src/jsp/searchresult.jsp Tue=
Nov 6 10:50:51 2007
@@ -127,10 +127,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 {
@@ -157,7 +157,7 @@
}
engineMap.put("searchResults",searchResults);
=
- searchViewHandler.getDomains().toArray(searchDomains);
+
searchViewHandler.getWebSiteSearchDelegate().getDomains().toArray(search=
Domains);
=
}
=
@@ -391,7 +391,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 shIt =3D
searchHandlers.values().iterator();
@@ -400,7 +400,7 @@
searchHandler =3D
(SearchHandler)shIt.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
