Changeset 1609 for trunk/docx4j/src/main/java

Timestamp:

07/10/11 04:43:04 (11 months ago)

Author:

jharrop

Message:

Support mc:AlternateContent preprocessing in MDP and Numbering part, when unmarshalling from either inputstream or w3c DOM element.

Location:

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

Files:

• MainDocumentPart.java (modified) (3 diffs)
• NumberingDefinitionsPart.java (modified) (3 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/MainDocumentPart.java

@@ -282 +282 @@
                                 jaxbElement =  (org.docx4j.wml.Document) binder.unmarshal( doc );
                         } catch (UnmarshalException ue) {
-
-                                // mimic docx4j 2.7.0 and earlier behaviour
+                                log.info("encountered unexpected content; pre-processing");
+                                /* Always try our preprocessor, since if what is first encountered is
+                                 * eg:
+                                 * 
+                                  <w14:glow w14:rad="101600"> ...
+                                 *
+                                 * the error would be:
+                                 *  
+                                 *    unexpected element (uri:"http://schemas.microsoft.com/office/word/2010/wordml", local:"glow")
+                                 *
+                                 * but there could well be mc:AlternateContent somewhere 
+                                 * further down in the document.
+                                 */
+
+                                // mimic docx4j 2.7.0 and earlier behaviour; this will 
+                                // drop w14:glow etc; the preprocessor doesn't need to 
+                                // do that
                                 eventHandler.setContinue(true);
                                 
-                                if (ue.getMessage().contains(JaxbValidationEventHandler.UNEXPECTED_MC_ALTERNATE_CONTENT)) {
-                                        // Try our preprocessor
-                                        log.info("encountered mc:AlternateContent; pre-processing");
+                                // There is no JAXBResult(binder),
+                                // so use a 
+                                DOMResult result = new DOMResult();
+                                
+                                Templates mcPreprocessorXslt = JaxbValidationEventHandler.getMcPreprocessor();
+                                XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
+                                
+                                doc = (org.w3c.dom.Document)result.getNode();
                                         
-                                        // There is no JAXBResult(binder),
-                                        // so use a 
-                                        DOMResult result = new DOMResult();
-                                        
-                                        Templates mcPreprocessorXslt = JaxbValidationEventHandler.getMcPreprocessor();
-                                        XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
-                                        
-                                        doc = (org.w3c.dom.Document)result.getNode();
-                                        
-                                } else {
-                                        log.error(ue);
-                                        log.info("trying again; likely attribute/element loss");                                        
-                                }
                                 jaxbElement =  (org.docx4j.wml.Document) binder.unmarshal( doc );                                       
                                 
@@ -308 +315 @@
                         
                         return jaxbElement;
-/*                                  
-                        Unmarshaller u = jc.createUnmarshaller();
-
-                        //u.setSchema(org.docx4j.jaxb.WmlSchema.schema);                        
-                        u.setEventHandler(new org.docx4j.jaxb.JaxbValidationEventHandler());
-                        
-//                      JAXBElement<?> root = (JAXBElement<?>)u.unmarshal( is );                        
-//                      jaxbElement = (org.docx4j.wml.Document)root.getValue();
-                        
-                        jaxbElement =  (org.docx4j.wml.Document) u.unmarshal( is );
-                        return jaxbElement;
-                        
-                        //System.out.println("\n\n" + this.getClass().getName() + " unmarshalled \n\n" );                                                                       
-*/
                         
                 } catch (Exception e ) {
@@ -334 +327 @@
 
                         binder = jc.createBinder();
-                        binder.setEventHandler(
-                                        new org.docx4j.jaxb.JaxbValidationEventHandler());                      
-                        jaxbElement = (org.docx4j.wml.Document) binder.unmarshal( el );
-
+                        JaxbValidationEventHandler eventHandler = new JaxbValidationEventHandler();
+                        eventHandler.setContinue(false);
+                        binder.setEventHandler(eventHandler);
+                        
+                        try {
+                                jaxbElement =  (org.docx4j.wml.Document) binder.unmarshal( el );
+                        } catch (UnmarshalException ue) {
+                                log.info("encountered unexpected content; pre-processing");
+                                try {
+                                        org.w3c.dom.Document doc;
+                                        if (el instanceof org.w3c.dom.Document) {
+                                                doc = (org.w3c.dom.Document) el;
+                                        } else {
+                                                // Hope for the best. Dodgy though; what if this is
+                                                // being used on something deep in the tree?
+                                                // TODO: revisit
+                                                doc = el.getOwnerDocument();
+                                        }
+                                        eventHandler.setContinue(true);
+                                        DOMResult result = new DOMResult();
+                                        Templates mcPreprocessorXslt = JaxbValidationEventHandler
+                                                        .getMcPreprocessor();
+                                        XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
+                                        doc = (org.w3c.dom.Document) result.getNode();
+                                        jaxbElement = (org.docx4j.wml.Document) binder
+                                                        .unmarshal(doc);
+                                } catch (Exception e) {
+                                        throw new JAXBException("Preprocessing exception", e);
+                                }
+                        }
                         return jaxbElement;
                         
                 } catch (JAXBException e) {
-//                      e.printStackTrace();
                         log.error(e);
                         throw e;

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/WordprocessingML/NumberingDefinitionsPart.java

@@ -22 +22 @@
 
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.util.HashMap;
 
 import javax.xml.bind.JAXBException;
+import javax.xml.bind.UnmarshalException;
 import javax.xml.bind.Unmarshaller;
-
+import javax.xml.bind.util.JAXBResult;
+import javax.xml.transform.Templates;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.docx4j.XmlUtils;
 import org.docx4j.jaxb.Context;
+import org.docx4j.jaxb.JaxbValidationEventHandler;
 import org.docx4j.model.PropertyResolver;
 import org.docx4j.model.listnumbering.AbstractListNumberingDefinition;
@@ -34 +42 @@
 import org.docx4j.model.listnumbering.ListLevel;
 import org.docx4j.model.listnumbering.ListNumberingDefinition;
+import org.docx4j.openpackaging.exceptions.Docx4JException;
 import org.docx4j.openpackaging.exceptions.InvalidFormatException;
 import org.docx4j.openpackaging.exceptions.InvalidOperationException;
@@ -296 +305 @@
         }
         
-        
+        @Override
+    public Numbering unmarshal( java.io.InputStream is ) throws JAXBException {
+        
+                try {
+                                                            
+                        Unmarshaller u = jc.createUnmarshaller();
+                        
+                        JaxbValidationEventHandler eventHandler = new JaxbValidationEventHandler();
+                        if (is.markSupported()) {
+                                // Only fail hard if we know we can restart
+                                eventHandler.setContinue(false);
+                        }
+                        u.setEventHandler(eventHandler);
+                        
+                        try {
+                                jaxbElement = (Numbering) XmlUtils.unwrap(
+                                                u.unmarshal( is ));     
+                        } catch (UnmarshalException ue) {
+                                
+                                if (is.markSupported() ) {
+                                        // When reading from zip, we use a ByteArrayInputStream,
+                                        // which does support this.
+                                
+                                        log.info("encountered unexpected content; pre-processing");
+                                        eventHandler.setContinue(true);
+                                                                                
+                                        try {
+                                                Templates mcPreprocessorXslt = JaxbValidationEventHandler.getMcPreprocessor();
+                                                is.reset();
+                                                JAXBResult result = XmlUtils.prepareJAXBResult(Context.jc);
+                                                XmlUtils.transform(new StreamSource(is), 
+                                                                mcPreprocessorXslt, null, result);
+                                                jaxbElement = (Numbering) XmlUtils.unwrap(
+                                                                result.getResult() );   
+                                        } catch (Exception e) {
+                                                throw new JAXBException("Preprocessing exception", e);
+                                        }
+                                                                                        
+                                } else {
+                                        log.error(ue);
+                                        log.error(".. and mark not supported");
+                                        throw ue;
+                                }
+                        }
+                        
+
+                } catch (JAXBException e ) {
+                        log.error(e);
+                        throw e;
+                }
+        
+                return jaxbElement;
+        
+    }   
+
+        @Override
+    public Numbering unmarshal(org.w3c.dom.Element el) throws JAXBException {
+
+                try {
+
+                        Unmarshaller u = jc.createUnmarshaller();
+                        JaxbValidationEventHandler eventHandler = new JaxbValidationEventHandler();
+                        eventHandler.setContinue(false);
+                        u.setEventHandler(eventHandler);
+                        
+                        try {
+                                jaxbElement = (Numbering) XmlUtils.unwrap(
+                                                u.unmarshal( el ) );
+                        } catch (UnmarshalException ue) {
+                                log.info("encountered unexpected content; pre-processing");
+                                try {
+                                        org.w3c.dom.Document doc;
+                                        if (el instanceof org.w3c.dom.Document) {
+                                                doc = (org.w3c.dom.Document) el;
+                                        } else {
+                                                // Hope for the best. Dodgy though; what if this is
+                                                // being used on something deep in the tree?
+                                                // TODO: revisit
+                                                doc = el.getOwnerDocument();
+                                        }
+                                        eventHandler.setContinue(true);
+                                        JAXBResult result = XmlUtils.prepareJAXBResult(Context.jc);
+                                        Templates mcPreprocessorXslt = JaxbValidationEventHandler
+                                                        .getMcPreprocessor();
+                                        XmlUtils.transform(doc, mcPreprocessorXslt, null, result);
+                                        jaxbElement = (Numbering) XmlUtils.unwrap(
+                                                        result.getResult() );   
+                                } catch (Exception e) {
+                                        throw new JAXBException("Preprocessing exception", e);
+                                }
+                        }
+                        return jaxbElement;
+                        
+                } catch (JAXBException e) {
+                        log.error(e);
+                        throw e;
+                }
+        }       
 }