Skip to content

'修复bug：当docx文档里存在空的引用时，解析报错' #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
glorialucheng wants to merge 1 commit into from
Closed

'修复bug：当docx文档里存在空的引用时，解析报错' #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mammoth/docx/body_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ def create(**kwargs):
**kwargs
))

if relationship_id is not None:
if relationship_id is not None and relationships.find_target_by_relationship_id(relationship_id) is not None:
href = relationships.find_target_by_relationship_id(relationship_id)
if anchor is not None:
href = replace_fragment(href, anchor)
Expand Down Expand Up @@ -578,9 +578,9 @@ def _read_image(image_file, alt_text):
def _find_blip_image(element):
embed_relationship_id = element.attributes.get("r:embed")
link_relationship_id = element.attributes.get("r:link")
if embed_relationship_id is not None:
if embed_relationship_id is not None and relationships.find_target_by_relationship_id(embed_relationship_id) is not None:
return _find_embedded_image(embed_relationship_id)
elif link_relationship_id is not None:
elif link_relationship_id is not None and relationships.find_target_by_relationship_id(link_relationship_id) is not None:
return _find_linked_image(link_relationship_id)
else:
return None
Expand Down Expand Up @@ -609,7 +609,7 @@ def open_image():

def read_imagedata(element):
relationship_id = element.attributes.get("r:id")
if relationship_id is None:
if relationship_id is None or relationships.find_target_by_relationship_id(relationship_id) is None:
warning = results.warning("A v:imagedata element without a relationship ID was ignored")
return _empty_result_with_message(warning)
else:
Expand Down
6 changes: 3 additions & 3 deletions mammoth/docx/relationships_xml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ def __init__(self, relationships):
self._targets_by_type[relationship.type].append(relationship.target)

def find_target_by_relationship_id(self, key):
return self._targets_by_id[key]
return self._targets_by_id.get(key, None)

def find_targets_by_type(self, relationship_type):
return self._targets_by_type[relationship_type]
return self._targets_by_type.get(relationship_type, [])


Relationships.EMPTY = Relationships([])
Expand All @@ -26,7 +26,7 @@ def find_targets_by_type(self, relationship_type):

def read_relationships_xml_element(element):
children = element.find_children("relationships:Relationship")
return Relationships(list(map(_read_relationship, children)))
return Relationships(list(filter(lambda x: x.target not in ('../NULL', 'NULL', 'word/../NULL'), map(_read_relationship, children))))


def _read_relationship(element):
Expand Down