Fixed #26 - Endnotes relationships are not being parsed

Author: aerkalov

ooxml/doc.py

@@ -160,7 +160,7 @@ def _calculate_possible_headers(self):
 
     def reset(self):
         self.elements = []
-        self.relationships = {}
+        self.relationships = {'document': {}, 'endnotes': {}}
         self.footnotes = {}
         self.endnotes = {}
         self.comments = {}

ooxml/parse.py

@@ -471,7 +471,7 @@ def parse_document(xmlcontent):
     return document
 
 
-def parse_relationship(document, xmlcontent):
+def parse_relationship(document, xmlcontent, rel_type):
     """Parse relationship document.
 
     Relationships hold information like external or internal references for links.
@@ -487,7 +487,7 @@ def parse_relationship(document, xmlcontent):
                    'type': elem.attrib['Type'],
                    'target_mode': elem.attrib.get('TargetMode', 'Internal')}
 
-            document.relationships[elem.attrib['Id']] = rel
+            document.relationships[rel_type][elem.attrib['Id']] = rel
 
 
 def parse_style(document, xmlcontent):
@@ -670,9 +670,15 @@ def parse_from_file(file_object):
 
     try:        
         doc_rel_content = file_object.read_file('_rels/document.xml.rels')
-        parse_relationship(document, doc_rel_content)
+        parse_relationship(document, doc_rel_content, 'document')
     except KeyError:
-        logger.warning('Could not read relationships.')
+        logger.warning('Could not read document relationships.')
+
+    try:        
+        doc_rel_content = file_object.read_file('_rels/endnotes.xml.rels')
+        parse_relationship(document, doc_rel_content, 'endnotes')
+    except KeyError:
+        logger.warning('Could not read endnotes relationships.')
 
     try:    
         comments_content = file_object.read_file('comments.xml')

ooxml/serialize.py

@@ -291,8 +291,8 @@ def serialize_link(ctx, document, elem, root):
 
                     children[-1].tail = u'{}{}'.format(_text, el.value())
 
-    if elem.rid in document.relationships:
-        _a.set('href', document.relationships[elem.rid].get('target', ''))
+    if elem.rid in document.relationships[ctx.options['relationship']]:
+        _a.set('href', document.relationships[ctx.options['relationship']][elem.rid].get('target', ''))
 
     fire_hooks(ctx, document, elem, _a, ctx.get_hook('a'))
 
@@ -308,8 +308,8 @@ def serialize_image(ctx, document, elem, root):
     _img = etree.SubElement(root, 'img')
     # make path configurable
 
-    if elem.rid in document.relationships:
-        img_src = document.relationships[elem.rid].get('target', '')
+    if elem.rid in document.relationships[ctx.options['relationship']]:
+        img_src = document.relationships[ctx.options['relationship']][elem.rid].get('target', '')
         img_name, img_extension = os.path.splitext(img_src)
 
         _img.set('src', 'static/{}{}'.format(elem.rid, img_extension))
@@ -1052,7 +1052,8 @@ def get_header(self, elem, style, node):
     'embed_fontsize': True,
     'smarttag_span': False,
     'comment_span': False,
-    'pretty_print': True
+    'pretty_print': True,
+    'relationship': 'document'
 }