Skip to content

Support self-closing XML tags #345

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

Open
igorshh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support self-closing XML tags #345

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
14 changes: 7 additions & 7 deletions wikiextractor/WikiExtractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ def open(self, filename):
# ----------------------------------------------------------------------
# READER

tagRE = re.compile(r'(.*?)<(/?\w+)[^>]*>(?:([^<]*)(<.*?>)?)?')
# 1 2 3 4
tagRE = re.compile(r'(.*?)<(/?\w+)[^/>]*(/?)>(?:([^<]*)(<.*?>)?)?')
# 1 2 3 4 5


def load_templates(file, output_file=None):
Expand Down Expand Up @@ -303,18 +303,18 @@ def collect_pages(text):
page = []
redirect = False
elif tag == 'id' and not id:
id = m.group(3)
id = m.group(4)
elif tag == 'id' and id: # <revision> <id></id> </revision>
revid = m.group(3)
revid = m.group(4)
elif tag == 'title':
title = m.group(3)
title = m.group(4)
elif tag == 'redirect':
redirect = True
elif tag == 'text':
inText = True
line = line[m.start(3):m.end(3)]
line = line[m.start(4):m.end(4)]
page.append(line)
if m.lastindex == 4: # open-close
if m.lastindex == 5 or m.group(3) == "/": # open-close
inText = False
elif tag == '/text':
if m.group(1):
Expand Down