Author: bpapez
Date: Tue Jan 15 13:26:51 2008
New Revision: 19512
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19512&repname=
=3Djahia
Log:
renamed slide to jcr
Modified:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/ajax=
/searchhighlight/SearchHighlightAction.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/JahiaSearchBaseService.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/WebDavSearchResultBuilderImpl.java
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/ajax/searchhighlight/SearchHighlightAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/ajax/searchhighlight/SearchHi=
ghlightAction.java&rev=3D19512&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/java/org/jahia/ajax=
/searchhighlight/SearchHighlightAction.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/ajax=
/searchhighlight/SearchHighlightAction.java Tue Jan 15 13:26:51 2008
@@ -109,7 +109,7 @@
FileNode file =3D JahiaWebdavBaseService.getInstance()
.getDAVFileAccess(resURL, currentUser);
if ( file !=3D null ){
-// SlideResourceForHighLighting res =3D new SlideResourceFo=
rHighLighting(file,searchEngine);
+// JcrResourceForHighLighting res =3D new JcrResourceForHig=
hLighting(file,searchEngine);
// JahiaCompassHighlighter highlighter =3D getCompassHighli=
ghter(res,searchQuery,org.apache.slide.index.lucene.Index.CONTENT_FIELD_NAM=
E);
// String highlightedText =3D null;
// if ( highlighter !=3D null ){
@@ -146,7 +146,7 @@
/**
* Returns an highlighter for the hits.
*/
-// protected JahiaCompassHighlighter getCompassHighlighter(SlideResourc=
eForHighLighting res,
+// protected JahiaCompassHighlighter getCompassHighlighter(JcrResourceF=
orHighLighting res,
// String q=
ueryStr, String fieldName){
//
// LuceneSearchEngineHighlighter highlighter =3D null;
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/search/JahiaSearchBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/JahiaSearchBa=
seService.java&rev=3D19512&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/java/org/jahia/serv=
ices/search/JahiaSearchBaseService.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/JahiaSearchBaseService.java Tue Jan 15 13:26:51 2008
@@ -87,9 +87,9 @@
import org.jahia.services.search.compass.CompassResourceConverter;
import org.jahia.services.search.compass.JahiaCompassHighlighter;
import org.jahia.services.search.indexingscheduler.*;
+import org.jahia.services.search.jcr.JcrSearchHandler;
import org.jahia.services.search.savedsearch.JahiaSavedSearch;
import org.jahia.services.search.lucene.JahiaAbstractHitCollector;
-import org.jahia.services.search.slide.JcrSearchHandler;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.sites.JahiaSitesService;
import org.jahia.services.usermanager.JahiaGroup;
Modified: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahi=
a/services/search/WebDavSearchResultBuilderImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-3-=
DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/WebDavSearchR=
esultBuilderImpl.java&rev=3D19512&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/core/src/java/org/jahia/serv=
ices/search/WebDavSearchResultBuilderImpl.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/WebDavSearchResultBuilderImpl.java Tue Jan 15 13:26:51 2008
@@ -27,7 +27,7 @@
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.webdav.JahiaWebdavBaseService;
-import org.jahia.services.search.slide.SlideSearchHit;
+import org.jahia.services.search.jcr.JcrSearchHit;
import org.jahia.services.content.FileNode;
=
/**
@@ -97,7 +97,7 @@
.getDAVFileAccess(uri, jParams.getUser());
if ( object !=3D null && object.isValid() && object.hasRev=
isions() ){
info =3D new JahiaSearchHit(parsedObject);
- SlideSearchHit searchHit =3D (SlideSearchHit)parsedObj=
ect.getSearchHit();
+ JcrSearchHit searchHit =3D (JcrSearchHit)parsedObject.=
getSearchHit();
searchHit.setFile(object);
info.setId(uri);
info.setObject(object);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
