Author: bpapez
Date: Tue Jan 15 12:04:17 2008
New Revision: 19509
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19509&repname=
=3Djahia
Log:
renamed slide to jcr
Added:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrResourceForHighLighting.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchEngineQuery.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchHandler.java
- copied, changed from r19488, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/JcrSearchHandler.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchHit.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchResult.java
- copied, changed from r19488, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/JcrSearchResult.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/SearchResultList.java
- copied, changed from r19488, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/SearchResultList.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/SearchResultListItem.java
- copied, changed from r19488, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/SearchResultListItem.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/decorator/
- copied from r19488, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core=
/src/java/org/jahia/services/search/slide/decorator/
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/decorator/SearchResultListItemWrapper.java
- copied, changed from r19507, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/decorator/SearchResultLi=
stItemWrapper.java
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/decorator/ShortDateWrapper.java
- copied, changed from r19507, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BR=
ANCH/core/src/java/org/jahia/services/search/slide/decorator/ShortDateWrapp=
er.java
Removed:
branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/slide/
Added: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/s=
ervices/search/jcr/JcrResourceForHighLighting.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/jcr/Jc=
rResourceForHighLighting.java&rev=3D19509&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/jcr/JcrResourceForHighLighting.java (added)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrResourceForHighLighting.java Tue Jan 15 12:04:17 2008
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2002-2006 Jahia Ltd
+ *
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
+ * not use this file except in compliance with the License. You should hav=
e =
+ * received a copy of the License along with this program; if not, you may=
obtain =
+ * a copy of the License at =
+ *
+ * http://www.jahia.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software =
+ * distributed under the License is distributed on an "AS IS" BASIS, =
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
+ * See the License for the specific language governing permissions and =
+ * limitations under the License.
+ */package org.jahia.services.search.jcr;
+
+import org.apache.lucene.document.Field;
+//import org.apache.slide.content.NodeProperty;
+import org.compass.core.Property;
+import org.compass.core.Resource;
+import org.compass.core.engine.SearchEngineException;
+import org.compass.core.lucene.LuceneProperty;
+import org.compass.core.lucene.engine.LuceneSearchEngine;
+import org.compass.core.util.StringUtils;
+import org.jahia.services.content.FileNode;
+
+import java.io.Reader;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: hollis
+ * Date: 21 f=C3=AF=C2=BF=C2=BDvr. 2006
+ * Time: 11:56:11
+ * To change this template use File | Settings | File Templates.
+ */
+public class JcrResourceForHighLighting implements Resource {
+
+ private Map properties =3D new HashMap();
+
+ private String aliasProperty;
+
+ private transient LuceneSearchEngine searchEngine;
+
+ private float boost =3D 1.0f;
+
+ public JcrResourceForHighLighting(FileNode file,
+ LuceneSearchEngine searchEngine) {
+ this.searchEngine =3D searchEngine;
+ this.aliasProperty =3D searchEngine.getSearchEngineFactory()
+ .getLuceneSettings().getAliasProperty();
+
+ if (file.isValid() && file.hasRevisions() && !file.isCollection())=
{
+
+// try {
+// long lastModifiedDate =3D System.currentTimeMillis();
+// String contentType =3D "";
+// properties =3D file.getProperties();
+// NodeProperty nodeProperty =3D (NodeProperty)properties.g=
et("DAV:getcontenttype");
+// if ( nodeProperty !=3D null ){
+// contentType =3D (String)nodeProperty.getValue();
+// }
+// nodeProperty =3D (NodeProperty)properties.get("DAV:"+Nod=
eRevisionDescriptor.LAST_MODIFIED);
+// if ( nodeProperty !=3D null ){
+// String lastModified =3D (String)nodeProperty.getVal=
ue();
+// try {
+// } catch ( Throwable t){
+// }
+// }
+// if ( contentType !=3D null ){
+// InputStream ins =3D file.downloadFile();
+// ExtractedDocument extDoc =3D ServicesRegistry.getIns=
tance().getFileExtractionService()
+// .getExtractedDocument(contentType, file.getPath(=
), lastModifiedDate,
+// true, ins);
+// ins.close();
+// if (extDoc !=3D null){
+// properties.put(org.apache.slide.index.lucene.Ind=
ex.CONTENT_FIELD_NAME,
+// new NodeProperty(org.apache.slide.index.=
lucene.Index.CONTENT_FIELD_NAME, extDoc.getContentAsString().replaceAll("\\=
<.*?\\>","")));
+// }
+// }
+// } catch (Throwable t) {
+// t.printStackTrace();
+// }
+ }
+ }
+
+ public Map getDAVProperties(){
+ return this.properties;
+ }
+
+ public String get(String name) {
+// NodeProperty nodeProp =3D (NodeProperty)properties.get(name);
+// if ( nodeProp !=3D null ){
+// return (String)nodeProp.getValue();
+// }
+ return null;
+ }
+
+ public String[] getValues(String name) {
+ String[] vals =3D new String[1];
+ String val =3D get(name);
+ if ( val =3D=3D null ){
+ return new String[0];
+ }
+ vals[0]=3Dval;
+ return vals;
+ }
+
+ public String getAlias() {
+ Property alias =3D getProperty(aliasProperty);
+ if (alias =3D=3D null) {
+ return null;
+ }
+ return alias.getStringValue();
+ }
+
+ public Resource setAlias(String alias) {
+ removeProperties(aliasProperty);
+ Property aliasProp =3D new LuceneProperty(new Field(aliasProperty,=
alias, Field.Store.YES,
+ Field.Index.UN_TOKENIZED));
+ addProperty(aliasProp);
+ return this;
+ }
+
+ public Resource addProperty(String name, Object value) throws SearchEn=
gineException {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Resource addProperty(String name, Reader value) throws SearchEn=
gineException {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Resource addProperty(Property property) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Resource removeProperty(String name) {
+ this.properties.remove(name);
+ return this;
+ }
+
+ public Resource removeProperties(String name) {
+ removeProperty(name);
+ return this;
+ }
+
+ public Property getProperty(String name) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Property[] getProperties(String name) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Property[] getProperties() {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public float getBoost() {
+ return this.boost;
+ }
+
+ public Resource setBoost(float boost) {
+ this.boost =3D boost;
+ return this;
+ }
+
+ public String toString() {
+ return "{" + getAlias() + "} " + StringUtils.arrayToCommaDelimited=
String(getProperties());
+ }
+
+ // methods from the Map interface
+ // ------------------------------
+
+ public void clear() {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public boolean containsValue(Object value) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Set entrySet() {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public void putAll(Map t) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Set keySet() {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Object remove(Object key) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public Object put(Object key, Object value) {
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+ public boolean containsKey(Object key) {
+ return getProperty(key.toString()) !=3D null;
+ }
+
+ public int size() {
+ return this.properties.size();
+ }
+
+ public boolean isEmpty() {
+ return this.properties.isEmpty();
+ }
+
+ public Collection values() {
+ return this.properties.values();
+ }
+
+ public Object get(Object key) {
+ return getProperties(key.toString());
+ }
+
+ public void copy(org.compass.core.Resource resource){
+ throw new UnsupportedOperationException("Map operations are suppor=
ted for read operations only");
+ }
+
+}
Added: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/s=
ervices/search/jcr/JcrSearchEngineQuery.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/jcr/Jc=
rSearchEngineQuery.java&rev=3D19509&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/jcr/JcrSearchEngineQuery.java (added)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchEngineQuery.java Tue Jan 15 12:04:17 2008
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2002-2006 Jahia Ltd
+ *
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
+ * not use this file except in compliance with the License. You should hav=
e =
+ * received a copy of the License along with this program; if not, you may=
obtain =
+ * a copy of the License at =
+ *
+ * http://www.jahia.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software =
+ * distributed under the License is distributed on an "AS IS" BASIS, =
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
+ * See the License for the specific language governing permissions and =
+ * limitations under the License.
+ */package org.jahia.services.search.jcr;
+
+import org.compass.core.lucene.engine.LuceneSearchEngineQuery;
+import org.compass.core.lucene.engine.LuceneSearchEngine;
+import org.apache.lucene.search.*;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.TermEnum;
+import org.apache.lucene.index.Term;
+
+import java.io.IOException;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: hollis
+ * Date: 9 mars 2006
+ * Time: 16:55:32
+ * To change this template use File | Settings | File Templates.
+ */
+public class JcrSearchEngineQuery extends LuceneSearchEngineQuery {
+
+ private QueryWrapper wrappedQuery;
+
+ public JcrSearchEngineQuery(LuceneSearchEngine searchEngine, Query que=
ry) {
+ super(searchEngine,query);
+ wrappedQuery =3D new QueryWrapper(query);
+ }
+
+ public Query toQuery() {
+ return wrappedQuery;
+ }
+
+ private class QueryWrapper extends Query {
+
+ private Query query;
+
+ public QueryWrapper(Query query) {
+ this.query =3D query;
+ }
+
+ public void setBoost(float v) {
+ this.query.setBoost(v);
+ }
+
+ public float getBoost() {
+ return this.query.getBoost();
+ }
+
+ public String toString(String string){
+ return this.query.toString(string);
+ }
+
+ public java.lang.String toString() {
+ return this.query.toString();
+ }
+
+ public org.apache.lucene.search.Weight weight(org.apache.lucene.se=
arch.Searcher searcher) throws java.io.IOException {
+ return this.query.weight(searcher);
+ }
+
+ public org.apache.lucene.search.Query rewrite(org.apache.lucene.in=
dex.IndexReader indexReader) throws java.io.IOException {
+ return this.query;
+ }
+
+ public org.apache.lucene.search.Query combine(org.apache.lucene.se=
arch.Query[] queries) {
+ return this.query.combine(queries);
+ }
+
+ public void extractTerms(java.util.Set set) {
+ this.query.extractTerms(set);
+ }
+
+ public org.apache.lucene.search.Similarity getSimilarity(org.apach=
e.lucene.search.Searcher searcher) {
+ return this.query.getSimilarity(searcher);
+ }
+
+ public java.lang.Object clone() {
+ return this.query.clone();
+ }
+
+ }
+}
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/JcrSearchHandler.java (from r19488, branches/JAHIA-5-0-=
3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/slide/JcrSe=
archHandler.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/jcr/JcrSearch=
Handler.java&rev=3D19509&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/slide/JcrSearchHandler.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchHandler.java Tue Jan 15 12:04:17 2008
@@ -14,17 +14,19 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide;
+ */package org.jahia.services.search.jcr;
=
import org.apache.lucene.search.Filter;
import org.jahia.bin.Jahia;
import org.jahia.params.ParamBean;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.services.content.JCRStoreProvider;
import org.jahia.services.content.JCRStoreService;
import org.jahia.services.search.*;
import org.jahia.services.search.lucene.JahiaAbstractHitCollector;
=
import javax.jcr.Session;
+import javax.jcr.Workspace;
import javax.jcr.query.*;
import java.util.ArrayList;
import java.util.List;
@@ -82,85 +84,51 @@
// not supported for webdav slide
}
=
- public void search(String query, SearchResult collector, Filter filter=
) {
+ public void search(String queryStatement, SearchResult collector, Filt=
er filter) {
SearchResult result =3D null;
=
try {
=
ParamBean jParams =3D (ParamBean)Jahia.getThreadParamBean();
-// StringBuffer serverUrlBuffer =3D new StringBuffer(jParams.ge=
tRealRequest().getScheme());
-// serverUrlBuffer.append("://");
-// serverUrlBuffer.append(jParams.getServerName());
-// serverUrlBuffer.append(":");
-// serverUrlBuffer.append(jParams.getServerPort());
-// serverUrlBuffer.append(jParams.getContextPath());
-// serverUrlBuffer.append("/server/default/");
-// serverUrlBuffer.append(jParams.getSiteKey());
-// String serverUrl =3D serverUrlBuffer.toString();
-//
-// String path =3D jParams.getContextPath() + "/server/default/=
" + jParams.getSiteKey();
-// SearchMethod method =3D new SearchMethod(path,query);
-// HttpURL httpURL =3D new HttpURL(serverUrl);
-// WebdavResource webdavResource =3D new WebdavResource(httpURL=
,WebdavResource.NOACTION, 0);
-// String id =3D jParams.getSession(true).getId();
-// webdavResource.getSessionInstance(httpURL).getState().addCoo=
kie(new Cookie(httpURL.getHost(), "JSESSIONID", id, "/", -1, false));
-// webdavResource.getSessionInstance(httpURL).getState().addCoo=
kie(new Cookie(httpURL.getHost(), "JSESSIONID", id, jParams.getContextPath(=
), -1, false));
-// jParams.getSession().setAttribute("org.apache.slide.webdav.m=
ethod.credentials", jParams.getUser().getUsername());
-//
-// HttpClient client =3D webdavResource.getSessionInstance(http=
URL);
-// //element(*,jahiant:file)[jcr:contains(jcr:[EMAIL
PROTECTED]:dat=
a,'route')]
-// int state =3D client.executeMethod(method);
-// logger.debug("Webdav search state :" + state);
-// /*
-// Header[] headers =3D method.getResponseHeaders();
-// String header =3D "";
-// for (int i =3D 0; i < headers.length; i++) {
-// header =3D headers[i].toString();
-// System.out.println(headers[i].toString());
-// }
-// */
-// if ( state =3D=3D 207 ){
-// result =3D getSearchResult(method.getAllResponseURLs(), =
jParams);
-// }
-
-// Session session =3D null;
-// Workspace ws =3D null;
-//
-
- if (query =3D=3D null || query.length() =3D=3D 0) {
+ =
+ if (queryStatement =3D=3D null || queryStatement.length() =3D=
=3D 0) {
return;
}
=
- JCRStoreService jcrStoreService =3D ServicesRegistry.getInstan=
ce().getJCRStoreService();
-// Session session =3D jcrStoreService.getSession(jParams);
-//
-// QueryManager qm =3D session.getWorkspace().getQueryManager();
-// Query q =3D qm.createQuery(query, Query.XPATH);
-//
-// QueryResult queryResult =3D q.execute();
-// RowIterator it =3D queryResult.getRows();
-//
-// SearchResult searchResult =3D new JcrSearchResult();
-// while (it.hasNext()) {
-// Row row =3D it.nextRow();
-// String path =3D row.getValue("jcr:path").getString();
-// SlideSearchHit searchHit =3D new SlideSearchHit(path);
-//
-// ArrayList list =3D new ArrayList();
-// list.add(path);
-// searchHit.getFields().put("uri",list);
-// List l =3D new ArrayList();
-// l.add("file");
-// searchHit.getFields().put(JahiaSearchConstant.CONTENT_TY=
PE, l);
-//// searchHit.getFields().put(JahiaSearchConstant.ID, path=
);
-////
-// searchHit.setScore((float) (row.getValue("jcr:score").ge=
tDouble()/1000.));
-// searchResult.add(searchHit);
-// searchHit.setSearchResult(searchResult);
-// }
-//
-// collector.results().addAll(searchResult.results());
- } catch ( Throwable t ){
+ //TODO: We now only search on the main JCRStoreProvider. There=
could be different =
+ // providers and we either need to search on all of them, or s=
electively. Some may
+ // not be of type JCRStoreProvider!!
+ JCRStoreProvider jcrStore =3D JCRStoreService.getInstance()
+ .getMainStoreProvider();
+ =
+ QueryManager qm =3D jcrStore.getQueryManager(jParams.getUser()=
);
+ Query query =3D qm.createQuery(queryStatement, Query.XPATH);
+
+ QueryResult queryResult =3D query.execute();
+ RowIterator it =3D queryResult.getRows();
+
+ SearchResult searchResult =3D new JcrSearchResult();
+ while (it.hasNext()) {
+ Row row =3D it.nextRow();
+ String path =3D row.getValue("jcr:path").getString();
+ JcrSearchHit searchHit =3D new JcrSearchHit(path);
+
+ ArrayList list =3D new ArrayList();
+ list.add(path);
+ searchHit.getFields().put("uri", list);
+ List l =3D new ArrayList();
+ l.add("file");
+ searchHit.getFields().put(JahiaSearchConstant.CONTENT_TYPE=
, l);
+ // searchHit.getFields().put(JahiaSearchConstant.ID, path);
+ //
+ searchHit.setScore((float) (row.getValue("jcr:score")
+ .getDouble() / 1000.));
+ searchResult.add(searchHit);
+ searchHit.setSearchResult(searchResult);
+ }
+
+ collector.results().addAll(searchResult.results());
+ } catch (Throwable t) {
logger.error("Exception Slide search", t);
}
}
@@ -208,7 +176,7 @@
// while ( responseURLs.hasMoreElements() && count<maxHit ){
// uri =3D (String)responseURLs.nextElement();
// uri =3D java.net.URLDecoder.decode(uri,"UTF-8");
-// searchHit =3D new SlideSearchHit(uri);
+// searchHit =3D new JcrSearchHit(uri);
// ArrayList list =3D new ArrayList();
// list.add(uri);
// searchHit.getFields().put("uri",list);
Added: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/s=
ervices/search/jcr/JcrSearchHit.java
URL: https://svndev.jahia.net/websvn/filedetails.php?path=3D/branches/JAHIA=
-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/jcr/Jc=
rSearchHit.java&rev=3D19509&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/jcr/JcrSearchHit.java (added)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchHit.java Tue Jan 15 12:04:17 2008
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2002-2006 Jahia Ltd
+ *
+ * Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (J=
CDDL), =
+ * Version 1.0 (the "License"), or (at your option) any later version; you=
may =
+ * not use this file except in compliance with the License. You should hav=
e =
+ * received a copy of the License along with this program; if not, you may=
obtain =
+ * a copy of the License at =
+ *
+ * http://www.jahia.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software =
+ * distributed under the License is distributed on an "AS IS" BASIS, =
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
+ * See the License for the specific language governing permissions and =
+ * limitations under the License.
+ */package org.jahia.services.search.jcr;
+
+import org.jahia.services.search.SearchHitImpl;
+import org.jahia.services.content.FileNode;
+
+import java.util.Hashtable;
+
+/**
+ * <p>Title: Contains information returned by the search result as a map
+ * of fieldname/values pair.</p>
+ * <p>Description: </p>
+ * <p>Copyright: Copyright (c) 2004</p>
+ * <p>Company: </p>
+ *
+ * @author Khue Nguyen
+ * @version 1.0
+ */
+public class JcrSearchHit extends SearchHitImpl {
+
+ private FileNode file;
+
+ public JcrSearchHit(Object object){
+ super(object);
+ }
+
+ public JcrSearchHit(float score, Hashtable fields){
+ super(score,fields);
+ }
+
+ public FileNode getFile() {
+ return file;
+ }
+
+ public void setFile(FileNode file) {
+ this.file =3D file;
+ }
+
+}
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/JcrSearchResult.java (from r19488, branches/JAHIA-5-0-3=
-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/slide/JcrSea=
rchResult.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/jcr/JcrSearch=
Result.java&rev=3D19509&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/slide/JcrSearchResult.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/JcrSearchResult.java Tue Jan 15 12:04:17 2008
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide;
+ */package org.jahia.services.search.jcr;
=
import org.jahia.services.search.SearchResultImpl;
=
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/SearchResultList.java (from r19488, branches/JAHIA-5-0-=
3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/slide/Searc=
hResultList.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/jcr/SearchRes=
ultList.java&rev=3D19509&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/slide/SearchResultList.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/SearchResultList.java Tue Jan 15 12:04:17 2008
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide;
+ */package org.jahia.services.search.jcr;
=
import org.jahia.data.search.JahiaSearchResult;
import org.jahia.data.search.JahiaSearchHit;
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/SearchResultListItem.java (from r19488, branches/JAHIA-=
5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/slide/S=
earchResultListItem.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/jcr/SearchRes=
ultListItem.java&rev=3D19509&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/slide/SearchResultListItem.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/SearchResultListItem.java Tue Jan 15 12:04:17 2008
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide;
+ */package org.jahia.services.search.jcr;
=
import org.jahia.services.content.FileNode;
import org.apache.commons.lang.builder.CompareToBuilder;
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/decorator/SearchResultListItemWrapper.java (from r19507=
, branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/servic=
es/search/slide/decorator/SearchResultListItemWrapper.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/jcr/decorator=
/SearchResultListItemWrapper.java&rev=3D19509&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/slide/decorator/SearchResultListItemWrapper.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/decorator/SearchResultListItemWrapper.java Tue Jan 15 12:04=
:17 2008
@@ -14,11 +14,11 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide.decorator;
+ */package org.jahia.services.search.jcr.decorator;
=
import org.displaytag.decorator.TableDecorator;
import org.apache.commons.lang.time.FastDateFormat;
-import org.jahia.services.search.slide.SearchResultListItem;
+import org.jahia.services.search.jcr.SearchResultListItem;
=
/**
*
Copied: branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/=
services/search/jcr/decorator/ShortDateWrapper.java (from r19507, branches/=
JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/services/search/s=
lide/decorator/ShortDateWrapper.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/jcr/decorator=
/ShortDateWrapper.java&rev=3D19509&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/slide/decorator/ShortDateWrapper.java (original)
+++ branches/JAHIA-5-0-3-DMS-JACKRABBIT-BRANCH/core/src/java/org/jahia/serv=
ices/search/jcr/decorator/ShortDateWrapper.java Tue Jan 15 12:04:17 2008
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied=
. =
* See the License for the specific language governing permissions and =
* limitations under the License.
- */package org.jahia.services.search.slide.decorator;
+ */package org.jahia.services.search.jcr.decorator;
=
import org.displaytag.decorator.DisplaytagColumnDecorator;
import org.displaytag.properties.MediaTypeEnum;
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
