From 0f0c33ca3c1bbbbe70bbf9c7a37ff63060ae479a Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 1 Apr 2015 08:52:28 +0000 Subject: [PATCH] Again a fix for the calulation of the number of pages of a MPA. git-svn-id: https://svn.libreccm.org/ccm/trunk@3297 8810af33-2d31-482b-a856-94f89814c4df --- .../MultiPartArticleDataXMLGenerator.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleDataXMLGenerator.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleDataXMLGenerator.java index 7511e4433..3e9fe775e 100644 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleDataXMLGenerator.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/MultiPartArticleDataXMLGenerator.java @@ -63,16 +63,17 @@ public class MultiPartArticleDataXMLGenerator implements ExtraXMLGenerator { return "0"; } - long numberOfPages = 0; + long numberOfPages = 1; long index = 0; - long lastIndex = sections.size() - 1; + final long lastIndex = sections.size() - 1; while(sections.next()) { - index++; - //The check for last index is necessary because we don't want to count a page break after - //the last section - if (sections.getArticleSection().isPageBreak()) { + + if (sections.getArticleSection().isPageBreak() + && index < lastIndex) { numberOfPages++; } + + index++; } // if (numberOfPages == 0) {