From 28996e9a034bf041e0a38834a43fc02c2aad88ac Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Tue, 22 May 2007 16:18:24 +0000 Subject: [PATCH] Fix AVM mising a directory add event?? Lucane PATH now working for the staging area XPath is trying for all AVM stores (enven layers) - missing support for no name space mathing all ....and suport for names attributes ... on the AVM nodeservice git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../AVMLuceneIndexerAndSearcherFactory.java | 2 +- .../impl/lucene/AVMLuceneIndexerImpl.java | 48 ++++++++++++++----- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerAndSearcherFactory.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerAndSearcherFactory.java index fd573a694a..069f528119 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerAndSearcherFactory.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerAndSearcherFactory.java @@ -67,7 +67,7 @@ public class AVMLuceneIndexerAndSearcherFactory extends AbstractLuceneIndexerAnd public AVMLuceneIndexerAndSearcherFactory() { - s_logger.error("Creating AVMLuceneIndexerAndSearcherFactory"); + //s_logger.error("Creating AVMLuceneIndexerAndSearcherFactory"); } /** diff --git a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java index 648393b4df..7228975e6e 100644 --- a/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java +++ b/source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java @@ -96,11 +96,6 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl private ContentService contentService; - @SuppressWarnings("unused") - private int srcVersion = -1; - - private int dstVersion = -1; - private Set indexedPaths = new HashSet(); /** @@ -170,8 +165,6 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl public void index(String store, int srcVersion, int dstVersion) { checkAbleToDoWork(IndexUpdateStatus.SYNCRONOUS); - this.srcVersion = srcVersion; - this.dstVersion = dstVersion; String path = store + ":/"; List changeList = avmSyncService.compare(srcVersion, path, dstVersion, path, null); @@ -194,12 +187,14 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl { indexDirectory(dstDesc); } + reindexAllAncestors(difference.getDestinationPath()); } // New Delete else if (!srcDesc.isDeleted() && ((dstDesc == null) || dstDesc.isDeleted())) { delete(difference.getSourcePath()); delete(difference.getDestinationPath()); + reindexAllAncestors(difference.getDestinationPath()); } // Existing delete else if (srcDesc.isDeleted() && dstDesc.isDeleted()) @@ -213,6 +208,8 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl // Should only reindex if the path has changed - not anything on a directory reindex(difference.getSourcePath(), srcDesc.isDirectory()); reindex(difference.getDestinationPath(), dstDesc.isDirectory()); + reindexAllAncestors(difference.getDestinationPath()); + reindexAllAncestors(difference.getDestinationPath()); } break; case AVMDifference.DIRECTORY: @@ -226,6 +223,35 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl } } + /* + * Nasty catch all fix up (as changes imply the parents may all have changed + */ + private void reindexAllAncestors(String destinationPath) + { + String[] splitPath = splitPath(destinationPath); + String store = splitPath[0]; + String pathInStore = splitPath[1]; + SimplePath simplePath = new SimplePath(pathInStore); + + StringBuilder pathBuilder = new StringBuilder(); + pathBuilder.append(store).append(":/"); + reindex(pathBuilder.toString(), false); + boolean requiresSep = false; + for (int i = 0; i < simplePath.size() - 1; i++) + { + if(requiresSep) + { + pathBuilder.append("/"); + } + else + { + requiresSep = true; + } + pathBuilder.append(simplePath.get(i)); + reindex(pathBuilder.toString(), false); + } + } + private void indexDirectory(AVMNodeDescriptor dir) { Map children = avmService.getDirectoryListing(dir); @@ -244,7 +270,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl protected List createDocuments(String stringNodeRef, boolean isNew, boolean indexAllProperties, boolean includeDirectoryDocuments) { - AVMNodeDescriptor desc = avmService.lookup(dstVersion, stringNodeRef); + AVMNodeDescriptor desc = avmService.lookup(-1, stringNodeRef); List docs = new ArrayList(); if(desc == null) { @@ -280,7 +306,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl if (desc != null) { - NodeRef nodeRef = AVMNodeConverter.ToNodeRef(dstVersion, stringNodeRef); + NodeRef nodeRef = AVMNodeConverter.ToNodeRef(-1, stringNodeRef); Document xdoc = new Document(); xdoc.add(new Field("ID", nodeRef.toString(), Field.Store.YES, @@ -301,7 +327,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl boolean isAtomic = true; - Map properties = getIndexableProperties(desc, node, nodeRef, dstVersion, stringNodeRef); + Map properties = getIndexableProperties(desc, node, nodeRef, -1, stringNodeRef); for (QName propertyName : properties.keySet()) { Serializable value = properties.get(propertyName); @@ -430,7 +456,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl impl xdoc.add(new Field("TYPE", ISO9075.getXPathName(typeQName), Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO)); - for (QName classRef : avmService.getAspects(dstVersion, stringNodeRef)) + for (QName classRef : avmService.getAspects(-1, stringNodeRef)) { xdoc.add(new Field("ASPECT", ISO9075.getXPathName(classRef), Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO));