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

Merged V2.2 to HEAD

Browse Source 
7650: Merged V2.1 to V2.2
     7542: ML contribution fixes
     7545: Merged V2.0 to V2.1
        7544: Merged V1.4 to V2.0
           7338: Fix for potential time-based GUID issues
     7554: Fixed imports after library package change
     7582: WCM-967
     7584: Fixed dependecy list for SDK for jug-lgpl-2.0.0.jar
     7642: Fix for WCM-949

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-07 10:32:22 +00:00
parent f8d2a5d084
commit af5fd511b7
6 changed files with 328 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
View File

@@ -272,9 +272,23 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
reindexAllAncestors(difference.getDestinationPath());
}
// Existing delete
else if (srcDesc.isDeleted() && dstDesc.isDeleted())
else if (srcDesc.isDeleted())
{
// Nothing to do for this case
if ((dstDesc == null) || dstDesc.isDeleted())
{
// Nothing to do for this case - both are deleted/not there
}
else
{
// We are back from the dead ...the node used to be deleted
// Treat as new
index(difference.getDestinationPath());
if (dstDesc.isDirectory())
{
indexDirectory(dstDesc);
}
reindexAllAncestors(difference.getDestinationPath());
}
}
// Anything else then we reindex
else
@@ -425,7 +439,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
StringBuilder xpathBuilder = new StringBuilder();
for (int i = 0; i < simplePath.size(); i++)
{
xpathBuilder.append("/{}").append(simplePath.get(i));
xpathBuilder.append("/{}").append(ISO9075.encode(simplePath.get(i)));
}
String xpath = xpathBuilder.toString();