Jeroen Hoffman pushed to branch release/4.2 at cms-community / hippo-repository
Commits: 587694ff by Jasper Floor at 2018-03-07T10:16:26+01:00 REPO-1960 [back port to 11.2] prevent document variants from being counted as duplicates (cherry picked from commit 558e52a7072e201a2b04e84ade6ac87aaee551f6) - - - - - 6da2b3fb by Jeroen Hoffman at 2018-03-07T10:16:56+01:00 REPO-1960 [back port to 11.2] remove parent-check logic: lot of code for a situation that is very very unlikely (2 or 3 found variants with different parent) (cherry picked from commit 0c15259e9a1007f9f70a6d2d92ca70fab77822e0) - - - - - 459f3e51 by Jeroen Hoffman at 2018-03-07T10:17:04+01:00 REPO-1960 [back port to 11.2] simplify code (cherry picked from commit f69fe4e6284dd30fe003c307b5c5344cb00e1de1) - - - - - 1 changed file: - builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java Changes: ===================================== builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java ===================================== --- a/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java +++ b/builtin/src/main/java/org/hippoecm/repository/translation/HippoTranslatedNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 Hippo B.V. (http://www.onehippo.com) + * Copyright 2012-2018 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. @@ -64,20 +64,24 @@ public final class HippoTranslatedNode { } public Node getTranslation(String language) throws RepositoryException { - String id = node.getProperty(HippoTranslationNodeType.ID).getString(); - Query query = node.getSession().getWorkspace().getQueryManager().createQuery( + final String id = node.getProperty(HippoTranslationNodeType.ID).getString(); + final Query query = node.getSession().getWorkspace().getQueryManager().createQuery( "SELECT * FROM " + HippoTranslationNodeType.NT_TRANSLATED + " WHERE " + HippoTranslationNodeType.ID + "='" + id + "'" + " AND " + HippoTranslationNodeType.LOCALE + "='" + language + "'", Query.SQL); final QueryResult result = query.execute(); - NodeIterator nodes = result.getNodes(); + final NodeIterator nodes = result.getNodes(); if (!nodes.hasNext()) { - throw new ItemNotFoundException("Folder was not translated to " + language); + throw new ItemNotFoundException("Node " + node.getPath() + " was not translated to " + language); } - if (nodes.getSize() > 1) { - log.warn("More than one translated variant found for node " + id + " in language " + language); + + if (nodes.getSize() > 3) { + // check 3 for the stable draft/unpublished/published versions + log.warn("Not a maximum of 3 but {} translated variants found for node {} with translation id {} and language {}.", + nodes.getSize(), node.getPath(), id, language); } + return nodes.nextNode(); } View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/925618916afae97c5f401aeac6ca8476c4284d1d...459f3e51b10216e01a5936f6ebc2198de8e1f709 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/compare/925618916afae97c5f401aeac6ca8476c4284d1d...459f3e51b10216e01a5936f6ebc2198de8e1f709 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
