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

Compilation fixes on clashes with tenant-related work

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 15:08:10 +00:00
parent 222a89b0f8
commit 60ea2805cc
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
View File

@@ -304,7 +304,6 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
} }
Path[] paths = searchParameters.getAttributePaths().toArray(new Path[0]); Path[] paths = searchParameters.getAttributePaths().toArray(new Path[0]);
<<<<<<< .working
return new LuceneResultSet( return new LuceneResultSet(
hits, hits,
searcher, searcher,
@@ -312,10 +311,6 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
tenantService, tenantService,
paths, paths,
searchParameters); searchParameters);
=======
return new LuceneResultSet(hits, searcher, nodeService, paths, searchParameters);
>>>>>>> .merge-right.r6367
} }
catch (ParseException e) catch (ParseException e)
{ {
@@ -348,12 +343,13 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
return new EmptyResultSet(); return new EmptyResultSet();
} }
Hits hits = searcher.search(query); Hits hits = searcher.search(query);
<<<<<<< .working return new LuceneResultSet(
return new LuceneResultSet(hits, searcher, nodeService, tenantService, searchParameters.getAttributePaths().toArray( hits,
new Path[0]), searchParameters); searcher,
======= nodeService,
return new LuceneResultSet(hits, searcher, nodeService, searchParameters.getAttributePaths().toArray(new Path[0]), searchParameters); tenantService,
>>>>>>> .merge-right.r6367 searchParameters.getAttributePaths().toArray(new Path[0]),
searchParameters);
} }
catch (SAXPathException e) catch (SAXPathException e)
{ {
@@ -573,15 +569,10 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
boolean followAllParentLinks, String language) throws InvalidNodeRefException, XPathException boolean followAllParentLinks, String language) throws InvalidNodeRefException, XPathException
{ {
NodeSearcher nodeSearcher = new NodeSearcher(nodeService, dictionaryService, this); NodeSearcher nodeSearcher = new NodeSearcher(nodeService, dictionaryService, this);
<<<<<<< .working
contextNodeRef = tenantService.getName(contextNodeRef); contextNodeRef = tenantService.getName(contextNodeRef);
return nodeSearcher.selectNodes(contextNodeRef, xpath, parameters, namespacePrefixResolver,
followAllParentLinks, language);
=======
return nodeSearcher.selectNodes(contextNodeRef, xpath, parameters, namespacePrefixResolver, followAllParentLinks, language); return nodeSearcher.selectNodes(contextNodeRef, xpath, parameters, namespacePrefixResolver, followAllParentLinks, language);
>>>>>>> .merge-right.r6367
} }
/** /**