Changeset 1449 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

03/06/11 04:28:14 (15 months ago)

Author:

jharrop

Message:

Handle a databinding which points to Core or Extended Properties, or CoverPage? props.

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging

Files:

• io/Load.java (modified) (3 diffs)
• parts/DocPropsCorePart.java (modified) (3 diffs)
• parts/DocPropsExtendedPart.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/io/Load.java

@@ -31 +31 @@
 import org.apache.log4j.Logger;
 import org.docx4j.jaxb.Context;
+import org.docx4j.model.datastorage.BindingHandler;
 import org.docx4j.model.datastorage.CustomXmlDataStorage;
 import org.docx4j.model.datastorage.CustomXmlDataStorageImpl;
@@ -38 +39 @@
 import org.docx4j.openpackaging.exceptions.PartUnrecognisedException;
 import org.docx4j.openpackaging.packages.OpcPackage;
+import org.docx4j.openpackaging.parts.CustomXmlDataStoragePart;
 import org.docx4j.openpackaging.parts.CustomXmlDataStoragePropertiesPart;
 import org.docx4j.openpackaging.parts.Part;
@@ -276 +278 @@
                         if (entry instanceof org.docx4j.openpackaging.parts.CustomXmlDataStoragePart) {
                                 log.debug("Found a CustomXmlDataStoragePart, named " + entry.getPartName().getName() );
-                                if (entry.getRelationshipsPart()==null) { continue; }
-                                log.debug(".. it has a rels part");
-                                // Look in its rels for rel of @Type customXmlProps (eg @Target="itemProps1.xml")
-                                Relationship r = entry.getRelationshipsPart().getRelationshipByType(
-                                                Namespaces.CUSTOM_XML_DATA_STORAGE_PROPERTIES);
-                                if (r==null) {
-                                        log.debug(".. but that doesn't point to a  customXmlProps part");
-                                        continue;
+                                String itemId = null;
+                                if (entry.getRelationshipsPart()==null) { 
+                                        continue; 
+                                } else {
+                                        log.debug(".. it has a rels part");
+                                        // Look in its rels for rel of @Type customXmlProps (eg @Target="itemProps1.xml")
+                                        Relationship r = entry.getRelationshipsPart().getRelationshipByType(
+                                                        Namespaces.CUSTOM_XML_DATA_STORAGE_PROPERTIES);
+                                        if (r==null) {
+                                                log.debug(".. but that doesn't point to a  customXmlProps part");
+                                                continue;
+                                        }
+                                        CustomXmlDataStoragePropertiesPart customXmlProps = 
+                                                (CustomXmlDataStoragePropertiesPart)entry.getRelationshipsPart().getPart(r);
+                                        if (customXmlProps==null) {
+                                                log.error(".. but the target seems to be missing?");
+                                                
+                                                try {
+                                                        org.w3c.dom.Document document = ((CustomXmlDataStoragePart)entry).getData().getDocument();
+                                                        String localName = document.getDocumentElement().getLocalName();
+                                                        log.debug(localName);
+                                                        if (document.getDocumentElement().isDefaultNamespace("http://schemas.microsoft.com/?office/?2006/?coverPageProps")
+                                                                        || localName.equals("CoverPageProperties" ) ) {
+                                                                // Special case: CoverPageProperties
+                                                                // See "Office Well Defined Custom XML Parts"; see documentinteropinitiative.org/additionalinfo/IS29500/sect5.aspx
+                                                                // Has a rels part, but sometimes no target?  Sometimes it definitely does ...
+                                                                // Give it the store item id, Word 2007 seems to consistently allocate  
+                                                                itemId = BindingHandler.COVERPAGE_PROPERTIES_STOREITEMID.toLowerCase();
+                                                        } else {
+                                                                continue;
+                                                        }
+                                                } catch (Docx4JException e) {
+                                                        e.printStackTrace();
+                                                        continue;
+                                                }
+                                        } else {
+                                                itemId = customXmlProps.getItemId().toLowerCase();
+                                        }
                                 }
-                                CustomXmlDataStoragePropertiesPart customXmlProps = 
-                                        (CustomXmlDataStoragePropertiesPart)entry.getRelationshipsPart().getPart(r);
-                                if (customXmlProps==null) {
-                                        log.error(".. but the target seems to be missing?");
-                                        continue;
-                                }
-                                String itemId = customXmlProps.getItemId().toLowerCase();
                                 log.info("Identified/registered ds:itemId " + itemId);
                                 if (pkg.getCustomXmlDataStorageParts().get(itemId.toLowerCase())!=null) {

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

@@ -20 +20 @@
 package org.docx4j.openpackaging.parts;
 
+import java.io.IOException;
+
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.Source;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.log4j.Logger;
+import org.docx4j.XmlUtils;
 import org.docx4j.docProps.core.CoreProperties;
 import org.docx4j.jaxb.Context;
+import org.docx4j.jaxb.NamespacePrefixMappings;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -51 +62 @@
         
         private static Logger log = Logger.getLogger(DocPropsCorePart.class);
+        
+        private static XPathFactory xPathFactory;
+        private static XPath xPath;
+        static {
+                xPathFactory = XPathFactory.newInstance();
+                xPath = xPathFactory.newXPath();                
+        }
         
          /** 
@@ -114 +132 @@
     }
 
+        // Core Props and Extended Props can both be bound as if they
+        // were a custom xml part.  Copied from XmlPart.
+        
+        public String xpathGetString(String xpathString, String prefixMappings)  throws Docx4JException {
+                
+                Document doc = XmlUtils.marshaltoW3CDomDocument(
+                                getJaxbElement(), Context.jcDocPropsCore );
+                
+                try {
+                        getNamespaceContext().registerPrefixMappings(prefixMappings);
+                        
+                        String result = xPath.evaluate(xpathString, doc );
+                        log.debug(xpathString + " ---> " + result);
+                        return result;
+                } catch (Exception e) {
+                        throw new Docx4JException("Problems evaluating xpath '" + xpathString + "'", e);
+                }
+        }
+        private NamespacePrefixMappings nsContext;
+        private NamespacePrefixMappings getNamespaceContext() {
+                if (nsContext==null) {
+                        nsContext = new NamespacePrefixMappings();
+                        xPath.setNamespaceContext(nsContext);
+                }
+                return nsContext;
+        }
     
         

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

@@ -24 +24 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
 
 import org.apache.log4j.Logger;
+import org.docx4j.XmlUtils;
 import org.docx4j.docProps.extended.Properties;
 import org.docx4j.jaxb.Context;
+import org.docx4j.jaxb.NamespacePrefixMappings;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.parts.relationships.Namespaces;
+import org.w3c.dom.Document;
 
 
@@ -57 +63 @@
         
         private static Logger log = Logger.getLogger(DocPropsExtendedPart.class);
+        
+        private static XPathFactory xPathFactory;
+        private static XPath xPath;
+        static {
+                xPathFactory = XPathFactory.newInstance();
+                xPath = xPathFactory.newXPath();                
+        }
         
          /** 
@@ -123 +136 @@
         
     }
+
+        // Core Props and Extended Props can both be bound as if they
+        // were a custom xml part.  Copied from XmlPart.
+        
+        public String xpathGetString(String xpathString, String prefixMappings)  throws Docx4JException {
+                
+                Document doc = XmlUtils.marshaltoW3CDomDocument(
+                                getJaxbElement(), Context.jcDocPropsExtended );
+                
+                try {
+                        getNamespaceContext().registerPrefixMappings(prefixMappings);
+                        
+                        String result = xPath.evaluate(xpathString, doc );
+                        log.debug(xpathString + " ---> " + result);
+                        return result;
+                } catch (Exception e) {
+                        throw new Docx4JException("Problems evaluating xpath '" + xpathString + "'", e);
+                }
+        }
+        private NamespacePrefixMappings nsContext;
+        private NamespacePrefixMappings getNamespaceContext() {
+                if (nsContext==null) {
+                        nsContext = new NamespacePrefixMappings();
+                        xPath.setNamespaceContext(nsContext);
+                }
+                return nsContext;
+        }
         
 }