Changeset 1732 for trunk/docx4j/src/main

Timestamp:

12/17/11 14:35:42 (5 months ago)

Author:

jharrop

Message:

MERGEFIELD processing - proof of concept

Location:

trunk/docx4j/src/main/java/org/docx4j/model/fields

Files:

• FieldLocator.java (modified) (1 diff)
• FieldRef.java (modified) (1 diff)
• FieldsPreprocessor.java (modified) (2 diffs)
• merge (added)
• merge/MailMerger.java (added)

trunk/docx4j/src/main/java/org/docx4j/model/fields/FieldLocator.java

@@ -18 +18 @@
          * it will still be listed just once
          */
-        List<P> starts = new ArrayList<P>();
-        
+        List<P> starts = new ArrayList<P>();    
+        public List<P> getStarts() {
+                return starts;
+        }
+
         P currentP;
         int depth=0;

trunk/docx4j/src/main/java/org/docx4j/model/fields/FieldRef.java

@@ -305 +305 @@
         
         private JAXBElement<Text> instrText;
-        public JAXBElement<Text> getInstrText() {
-                return instrText;
+//      public JAXBElement<Text> getInstrText() {
+//              return instrText;
+//      }
+        public String getInstr() {
+                return instrText.getValue().getValue();
         }
         public void setInstrText(JAXBElement<Text> instrText) {

trunk/docx4j/src/main/java/org/docx4j/model/fields/FieldsPreprocessor.java

@@ -100 +100 @@
         }
         
-//      public static boolean supported(String type) {
-//              
-//              if (type.contains("MERGEFIELD")) {
-//                      return true;
-//              } else {
-//                      return false;
-//              }
-//      }
         
         public static P canonicalise(P p, List<FieldRef> fieldRefs) {
@@ -267 +259 @@
         }       
         
-        public static void main(String[] args) throws Exception {
-
-                WordprocessingMLPackage wordMLPackage = WordprocessingMLPackage.load(
-                                new java.io.File(
-                                                System.getProperty("user.dir") + "/mergefield1.docx"));
-                
-                complexifyFields(wordMLPackage.getMainDocumentPart() );
-                
-                System.out.println(XmlUtils.marshaltoString(wordMLPackage.getMainDocumentPart().getJaxbElement(), true, true));
-                
-                // canonicalise
-                FieldLocator fl = new FieldLocator();
-                new TraversalUtil(wordMLPackage.getMainDocumentPart().getContent(), fl);
-                log.info("Found " + fl.starts.size() + " fields ");
-                
-                List<FieldRef> fieldRefs = new ArrayList<FieldRef>();
-                
-                for( P p : fl.starts) {
-                        int index = ((ContentAccessor)p.getParent()).getContent().indexOf(p);
-                        P newP = canonicalise(p, fieldRefs);
-                        System.out.println("NewP length: " + newP.getContent().size() );
-                        ((ContentAccessor)p.getParent()).getContent().set(index, newP);
-                }
-                
-                // Prove we can put something into the results
-                int counter = 0;
-                for (FieldRef fr : fieldRefs) {
-                        fr.setResult("Result" + counter);
-                        counter++;
-                        
-                        // If doing an actual mail merge, the begin-separate run is removed, as is the end run
-                        fr.getParent().getContent().remove(fr.getBeginRun());
-                        fr.getParent().getContent().remove(fr.getEndRun());                     
-                }
-                
-                System.out.println(XmlUtils.marshaltoString(wordMLPackage.getMainDocumentPart().getJaxbElement(), true, true));
-                
-                wordMLPackage.save(new java.io.File(
-                                System.getProperty("user.dir") + "/mergefield1-OUT.docx") );
-                
-                
-        }
 }