Changeset 1162 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java

Timestamp:

07/14/10 08:41:22 (23 months ago)

Author:

jharrop

Message:

Content control binding extensions test/example

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java (modified) (6 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/CustomXmlDataStoragePart.java

@@ -175 +175 @@
         public static void preprocess(WordprocessingMLPackage wordMLPackage) throws Docx4JException {
 
-                Map<String, CustomXmlDataStoragePart> customXmlDataStorageParts = wordMLPackage.getCustomXmlDataStorageParts();         
+                //Map<String, CustomXmlDataStoragePart> customXmlDataStorageParts = wordMLPackage.getCustomXmlDataStorageParts();               
                 MainDocumentPart documentPart = wordMLPackage.getMainDocumentPart();
                                 
@@ -234 +234 @@
 
                 QueryString qs = new QueryString();
-                HashMap<String, String> map = qs.parseQueryString(tag.getVal());
+                HashMap<String, String> map = qs.parseQueryString(tag.getVal(), true);
                 
                 String bindingrole = map.get("bindingrole");
@@ -245 +245 @@
                 
                 // get the value
-                String storeItemId = map.get("w:storeItemID");
+                String storeItemId = map.get("w:storeItemID").toLowerCase();
                 String xpath = map.get("w:xpath");
                 String prefixMappings = map.get("w:prefixMappings");
@@ -269 +269 @@
                         log.info("Got value: " + val);
                         
-                        if (Boolean.getBoolean(val)) {
+                        if (new Boolean(val) ) {
                                 log.debug("so keeping");
                         } else {
@@ -365 +365 @@
                                                         log.debug("xpathBase: " + xpathBase);
                                                         int beginIndex = thisXPath.indexOf("/", xpathBase.length()+1 ); // +1 for good measure                                                  
-                                                        String newPath = xpathBase + "/*[" + i + "]/" + thisXPath.substring(beginIndex+1);                                                      
+                                                        String newPath = xpathBase + "/*[" + (i+1) + "]/" + thisXPath.substring(beginIndex+1);                                                  
                                                         log.debug("newPath: " + newPath);
                                                         binding.setXpath(newPath);
@@ -505 +505 @@
                         String storeItemId, String xpath, String prefixMappings) {
                 
-                CustomXmlDataStoragePart part = customXmlDataStorageParts.get(storeItemId);
+                CustomXmlDataStoragePart part = customXmlDataStorageParts.get(storeItemId.toLowerCase());
                 if (part==null) {
                         log.error("Couldn't locate part by storeItemId " + storeItemId);