collective/mediawiki_dump_tools
18
0
Fork 0
Code Issues Pull Requests Activity

code review.

Browse Source
This commit is contained in:
Nathan TeBlunthuis
2023-05-03 10:23:30 -07:00
parent 54fa6221a8
commit 933ca753ed
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wikiq
View File

@@ -145,29 +145,26 @@ class RegexPair(object):
if self.has_groups:
# if there are matches of some sort in this revision content, fill the lists for each cap_group
if content is not None and self.pattern.search(content) is not None:
m = self.pattern.finditer(content)
matchobjects = list(m)
if content is not None and len(matchobjects := list(self.pattern.finditer(content))) > 0:
for cap_group in self.capture_groups:
key = self._make_key(cap_group)
temp_list = []
for match in matchobjects:
# we only want to add the match for the capture group if the match is not None
if match.group(cap_group) != None:
temp_list.append(match.group(cap_group))
if (group := match.group(cap_group)) is not None:
temp_list.append(group)
# if temp_list of matches is empty just make that column None
if len(temp_list)==0:
temp_dict[key] = None
# else we put in the list we made in the for-loop above
else:
if count_only:
temp_dict[key] = len(temp_list)
# if temp_list of matches is empty just make that column None
if len(temp_list)==0:
temp_dict[key] = None
# else we put in the list we made in the for-loop above
else:
temp_dict[key] = ', '.join(temp_list)
if count_only:
temp_dict[key] = len(temp_list)
else:
temp_dict[key] = ', '.join(temp_list)
# there are no matches at all in this revision content, we default values to None
# there are no matches at all in this revision content, we default values to None
else:
for cap_group in self.capture_groups:
key = self._make_key(cap_group)