Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-plugin-relateddocs
Commits: 069d1023 by Marijan Milicevic at 2016-10-25T12:30:23+02:00 HIPPLUG-1402 Regression: Related Documents - Adding suggested document doesn't remove it from the list of suggestions. - remove existing documents from suggestion list - don't suggest own document (cherry picked from commit df3757461ccffd96ab3c1ce57552d1ba38380178) - - - - - 31b8ceea by Jeroen Hoffman at 2016-10-25T12:30:52+02:00 HIPPLUG-1402 remove 'else' branch that will not be reached; rename some variables for readability (e.g. itsParent --> canonicalDocument) (cherry picked from commit a1c183ca6a8a2c785003a1eccc1d4774e727c7e7) - - - - - d6271bf4 by Jeroen Hoffman at 2016-10-25T12:31:07+02:00 HIPPLUG-1402 Logging improvements (cherry picked from commit 3dc243ee4a5945254633b7bfb3390a034cfa3e13) - - - - - 9a08a1d5 by Jeroen Hoffman at 2016-10-25T12:31:40+02:00 HIPPLUG-1402 Indents only (cherry picked from commit 60b23aea9a10ac4623f437c0aabc5c56f0e030d3) - - - - - 64cf78b9 by Jeroen Hoffman at 2016-10-25T12:56:37+02:00 HIPPLUG-1402 Reintegrate local branch 'bugfix/HIPPLUG-1402' into release/3.2 - - - - - 1 changed file: - addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java Changes: ===================================== addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java ===================================== --- a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java +++ b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import javax.jcr.query.RowIterator; import org.hippoecm.frontend.model.JcrNodeModel; import org.hippoecm.frontend.plugin.IPluginContext; import org.hippoecm.frontend.plugin.config.IPluginConfig; -import org.hippoecm.repository.api.HippoQuery; +import org.hippoecm.repository.api.HippoNode; import org.onehippo.forge.relateddocs.RelatedDoc; import org.onehippo.forge.relateddocs.RelatedDocCollection; import org.onehippo.forge.relateddocs.RelatedDocsNodeType; @@ -66,22 +66,22 @@ public class SimilaritySearchRelatedDocsProvider extends AbstractRelatedDocsProv try { nodeModel = new JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS)); } catch (PathNotFoundException e) { - //I think when a new document is opened, the document doesn't contain the "relateddocs" node yet, so we *may* need to create one -- Vijay - log.info("Relateddocs node for current document not found, returning empty docs, so creating one." + e.getMessage()); + log.info("Relateddocs node for current document not found, returning empty docs, so creating one. Message={}.", e.getMessage()); nodeModel = new JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS, RelatedDocsNodeType.NT_RELATEDDOCS)); } RelatedDocCollection currentCollection = new RelatedDocCollection(nodeModel); - Set<String> uuidSet = new HashSet<String>(); + Set<String> currentUuidSet = new HashSet<>(); for (RelatedDoc r : currentCollection) { - uuidSet.add(r.getUuid()); + currentUuidSet.add(r.getUuid()); } Node docNode = documentModel.getNode(); + Node docHandleNode = docNode.getParent(); String xpathQuery = createXPathQuery(docNode); if (log.isDebugEnabled()) { - log.debug("Executing query{}: ", xpathQuery); + log.debug("Executing query: {}", xpathQuery); } @SuppressWarnings(value = "deprecation") Query query = nodeModel.getNode().getSession().getWorkspace().getQueryManager().createQuery( @@ -99,9 +99,27 @@ public class SimilaritySearchRelatedDocsProvider extends AbstractRelatedDocsProv // retrieve the found document from the repository try { Node document = nodeModel.getNode().getSession().getNode(path); + Node canonicalDocument = ((HippoNode) document).getCanonicalNode(); + if (docHandleNode.isSame(canonicalDocument)) { + if (log.isDebugEnabled()) { + log.debug("Skipping same handle node as 'self' at {}", canonicalDocument.getPath()); + } + continue; + } + + if (currentUuidSet.contains(document.getIdentifier())) { + if (log.isDebugEnabled()) { + log.debug("Not adding already selected document {}", document.getPath()); + } + continue; + } + + if (log.isDebugEnabled()) { + log.debug("Adding related document {}", document.getPath()); + } collection.add(new RelatedDoc(new JcrNodeModel(document), this.score * myScore)); } catch (RepositoryException e) { - log.error("Error handling SimilaritySearch results", e.getMessage()); + log.error("{} handling SimilaritySearch result on path {}. Message={}", e.getClass().getName(), path, e.getMessage()); } } return collection; View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-relateddocs/compare/c37e19dc36c372d9d07de63639c6a7513f068d61...64cf78b9585098d173fa800c7495899ff882324c
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
