Changeset 1733 for trunk/docx4j/src

Timestamp:

12/27/11 01:38:14 (5 months ago)

Author:

jharrop

Message:

Separate each output "document" with sectPr.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/fields/merge/MailMerger.java (modified) (8 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/fields/merge/MailMerger.java

@@ -3 +3 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -9 +10 @@
 
 import org.apache.log4j.Logger;
+import org.docx4j.Docx4jProperties;
 import org.docx4j.TraversalUtil;
 import org.docx4j.XmlUtils;
@@ -15 +17 @@
 import org.docx4j.model.fields.FieldRef;
 import org.docx4j.model.fields.FieldsPreprocessor;
+import org.docx4j.model.structure.PageDimensions;
+import org.docx4j.model.structure.PageSizePaper;
 import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.io.SaveToZipFile;
@@ -20 +24 @@
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.wml.Body;
+import org.docx4j.wml.CTPageNumber;
 import org.docx4j.wml.ContentAccessor;
 import org.docx4j.wml.P;
+import org.docx4j.wml.SectPr;
 
 
@@ -79 +85 @@
                 byte[] template = baos.toByteArray();
 
+                
                 WordprocessingMLPackage target = WordprocessingMLPackage.load(
                                 new ByteArrayInputStream(template));
+                SectPr documentSeparator = getDocumentSeparator(target);
                 target.getMainDocumentPart().getContent().clear();
                 
@@ -88 +96 @@
                         target.getMainDocumentPart().getContent().addAll(content);
                         
-                        // TODO - sectPr
+                        // for all but last document
+                        if (!content.equals(results.get(results.size()-1))) {
+                                // add sectPr to final paragraph
+                                Object last = content.get( content.size()-1);
+                                P lastP = null;
+                                if (last instanceof P) {
+                                        lastP = (P)last;
+                                } else {
+                                        lastP = Context.getWmlObjectFactory().createP();
+                                        target.getMainDocumentPart().getContent().add(lastP);   
+                                }
+                                if (lastP.getPPr()==null) {
+                                        lastP.setPPr(Context.getWmlObjectFactory().createPPr());                                
+                                }
+                                lastP.getPPr().setSectPr(documentSeparator);
+                        }
                 }
                 
@@ -94 +117 @@
         }
 
+           /**
+            * Word uses the existing sectPr element, but adds 
+            * a page numbering restart to it.  TODO: investigate
+            * what it does with headers/footers.
+         * @param template
+         * @return
+         */
+        private static SectPr getDocumentSeparator(WordprocessingMLPackage template) {
+                
+                   SectPr sectPr = template.getMainDocumentPart().getJaxbElement().getBody().getSectPr();
+                   
+                   if (sectPr==null) {
+                           // Maybe the last P already contains one?
+                           // Presumably Word would reuse this.
+                           List all = template.getMainDocumentPart().getContent();
+                        Object last = all.get( all.size()-1 );
+                        if (last instanceof P) {
+                                if (((P) last).getPPr()!=null 
+                                                && ((P) last).getPPr().getSectPr() !=null) {
+                                        sectPr = ((P) last).getPPr().getSectPr();
+                                }
+                        }                          
+                   }
+                   
+                   if (sectPr==null) {
+                           
+                                // Create a basic sectPr using our Page model
+                                String papersize= Docx4jProperties.getProperties().getProperty("docx4j.PageSize", "A4");
+                                log.info("Using paper size: " + papersize);
+                                
+                                String landscapeString = Docx4jProperties.getProperties().getProperty("docx4j.PageOrientationLandscape", "false");
+                                boolean landscape= Boolean.parseBoolean(landscapeString);
+                                log.info("Landscape orientation: " + landscape);
+                                
+                                PageDimensions page = new PageDimensions();
+                                page.setPgSize(PageSizePaper.valueOf(papersize), landscape);
+                                
+                                sectPr = Context.getWmlObjectFactory().createSectPr();
+                                sectPr.setPgSz(  page.getPgSz() );
+                                sectPr.setPgMar( page.getPgMar() );                             
+                   }
+                   
+                   // <w:pgNumType w:start="1"/>
+                   CTPageNumber pageNumber = sectPr.getPgNumType();
+                   if (pageNumber==null) {
+                           pageNumber = Context.getWmlObjectFactory().createCTPageNumber();
+                           sectPr.setPgNumType(pageNumber);
+                   }
+                   pageNumber.setStart(BigInteger.ONE);
+                   
+                   return sectPr;
+           }    
+        
         public static List<WordprocessingMLPackage> getResults(WordprocessingMLPackage input, 
                         List<Map<String, String>> data) throws Docx4JException {
@@ -225 +301 @@
                                                 System.getProperty("user.dir") + "/mergefield1.docx"));
                 
+                List<Map<String, String>> data = new ArrayList<Map<String, String>>();
+
                 Map<String, String> map = new HashMap<String, String>();
                 map.put("Kundenname", "Plutext");
                 map.put("Kundenstrasse", "Bourke Street");
                 
-                List<Map<String, String>> data = new ArrayList<Map<String, String>>();
                 data.add(map);
+                                
+                map = new HashMap<String, String>();
+                map.put("Kundenname", "Name 2");
+                map.put("Kundenstrasse", "Collins Street");
+                
+                data.add(map);          
+                // Word matches irrespective of case, and takes the first matching field
                 
                 
 //              System.out.println(XmlUtils.marshaltoString(wordMLPackage.getMainDocumentPart().getJaxbElement(), true, true));
 
-                WordprocessingMLPackage output = getConsolidatedResultCrude(wordMLPackage, data);
-                
-                
-                System.out.println(XmlUtils.marshaltoString(output.getMainDocumentPart().getJaxbElement(), true, true));
-                
-//              wordMLPackage.save(new java.io.File(
-//                              System.getProperty("user.dir") + "/mergefield1-OUT.docx") );
+                WordprocessingMLPackage output = org.docx4j.model.fields.merge.MailMerger.getConsolidatedResultCrude(wordMLPackage, data);
+                
+                
+                //System.out.println(XmlUtils.marshaltoString(output.getMainDocumentPart().getJaxbElement(), true, true));
+                
+                output.save(new java.io.File(
+                                System.getProperty("user.dir") + "/mergefield1-OUT.docx") );
                 
         }