inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:15:27 +00:00
parent a1bcf7419c
commit 41b5618d1d
71 changed files with 3153 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/java/org/alfresco/cmis/search/impl/CMISQueryServiceImpl.java
View File

@@ -24,7 +24,6 @@
*/
package org.alfresco.cmis.search.impl;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -36,6 +35,7 @@ import org.alfresco.cmis.search.CMISQueryOptions;
import org.alfresco.cmis.search.CMISQueryService;
import org.alfresco.cmis.search.CMISResultSet;
import org.alfresco.cmis.search.CMISResultSetImpl;
import org.alfresco.cmis.search.CmisFunctionEvaluationContext;
import org.alfresco.cmis.search.FullTextSearchSupport;
import org.alfresco.cmis.search.JoinSupport;
import org.alfresco.repo.search.impl.querymodel.Query;
@@ -51,7 +51,7 @@ public class CMISQueryServiceImpl implements CMISQueryService
private CMISService cmisService;
private CMISDictionaryService cmisDictionaryService;
private CMISPropertyService cmisPropertyService;
private CMISMapping cmisMapping;
@@ -105,10 +105,9 @@ public class CMISQueryServiceImpl implements CMISQueryService
this.nodeService = nodeService;
}
/**
* @param cmisPropertyService the cmisPropertyService to set
* @param cmisPropertyService
* the cmisPropertyService to set
*/
public void setCmisPropertyService(CMISPropertyService cmisPropertyService)
{
@@ -125,20 +124,17 @@ public class CMISQueryServiceImpl implements CMISQueryService
CMISQueryParser parser = new CMISQueryParser(options, cmisDictionaryService, cmisMapping, getJoinSupport());
Query query = parser.parse(queryEngine.getQueryModelFactory());
System.out.println(query);
try
{
ResultSet lucene = queryEngine.executeQuery(query, query.getSource().getSelector(), options);
Map<String, ResultSet> wrapped = new HashMap<String, ResultSet>();
wrapped.put(query.getSource().getSelector(), lucene);
CMISResultSet cmis = new CMISResultSetImpl(wrapped, options, nodeService, query, cmisDictionaryService, cmisPropertyService);
return cmis;
}
catch (IOException e)
{
// TODO Auto-generated catch block
e.printStackTrace();
}
return null;
CmisFunctionEvaluationContext functionContext = new CmisFunctionEvaluationContext();
functionContext.setCmisDictionaryService(cmisDictionaryService);
functionContext.setCmisPropertyService(cmisPropertyService);
functionContext.setNodeService(nodeService);
ResultSet lucene = queryEngine.executeQuery(query, query.getSource().getSelector(), options, functionContext);
Map<String, ResultSet> wrapped = new HashMap<String, ResultSet>();
wrapped.put(query.getSource().getSelector(), lucene);
CMISResultSet cmis = new CMISResultSetImpl(wrapped, options, nodeService, query, cmisDictionaryService, cmisPropertyService);
return cmis;
}
/*
@@ -169,7 +165,7 @@ public class CMISQueryServiceImpl implements CMISQueryService
*/
public FullTextSearchSupport getFullTextSearchSupport()
{
return FullTextSearchSupport.FULL_TEXT_AND_STRUCTURED;
return FullTextSearchSupport.FULL_TEXT_ONLY;
}
/*