Changeset 1734 for trunk/docx4j

Timestamp:

12/27/11 03:05:57 (5 months ago)

Author:

jharrop

Message:

Field name is case-insensitive when performing mail merge.

Location:

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

Files:

• DataFieldName.java (added)
• MailMerger.java (modified) (6 diffs)

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

@@ -52 +52 @@
  * will continue, as will footnotes/endnotes. 
  * 
+ * LIMITATIONS:
+ * - currently only applied to main document part
+ *   (easily extended)
+ * - no support for text before (\b) and text after (\f)
+ *   switches
+ * - no support for \m and \v switches
+ * - no support formatting (date/time, numeric, or general), 
+ *   including MERGEFORMAT (which means preserve
+ *   the formatting of any existing field result)
+ * - no support for multiple MERGEFIELD in a single
+ *   instruction (eg MERGEFIELD CoutesyTitle \f " " MERGEFIELD FirstName \f " " MERGEFIELD LastName ) 
+ * 
  * @author jharrop
  *
@@ -70 +82 @@
          */
         public static WordprocessingMLPackage getConsolidatedResultCrude(WordprocessingMLPackage input, 
-                        List<Map<String, String>> data) throws Docx4JException {
+                        List<Map<DataFieldName, String>> data) throws Docx4JException {
                 
                 // Just MDP for now
@@ -171 +183 @@
         
         public static List<WordprocessingMLPackage> getResults(WordprocessingMLPackage input, 
-                        List<Map<String, String>> data) throws Docx4JException {
+                        List<Map<DataFieldName, String>> data) throws Docx4JException {
                 
                 List<WordprocessingMLPackage> pkgs = new ArrayList<WordprocessingMLPackage>();
@@ -216 +228 @@
          */
         private static List<List<Object>> perform(ContentAccessor contentList, 
-                        List<Map<String, String>> data ) throws Docx4JException {
+                        List<Map<DataFieldName, String>> data ) throws Docx4JException {
                 
                                 
                 List<List<Object>> results = new ArrayList<List<Object>>();
-                for (Map<String, String> datamap : data) {
+                for (Map<DataFieldName, String> datamap : data) {
                         
                         // We need our fieldRefs point to the correct objects;
@@ -258 +270 @@
                                         log.info("Key: '" + key + "'");
                                         
-                                        String val = datamap.get(key);
+                                        String val = datamap.get( new DataFieldName(key));
                                         
                                         if (val==null) {
@@ -301 +313 @@
                                                 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<DataFieldName, String>> data = new ArrayList<Map<DataFieldName, String>>();
+
+                Map<DataFieldName, String> map = new HashMap<DataFieldName, String>();
+                map.put( new DataFieldName("Kundenname"), "Plutext");
+                map.put(new DataFieldName("Kundenstrasse"), "Bourke Street");
                 
                 data.add(map);
                                 
-                map = new HashMap<String, String>();
-                map.put("Kundenname", "Name 2");
-                map.put("Kundenstrasse", "Collins Street");
+                map = new HashMap<DataFieldName, String>();
+                map.put( new DataFieldName("Kundenname"), "Jason");
+                map.put(new DataFieldName("Kundenstrasse"), "Collins Street");
                 
                 data.add(map);