Skip to content

Commit

Permalink
Fix group/theme inheritance from broader
Browse files Browse the repository at this point in the history
  • Loading branch information
arielpontes committed Jan 18, 2021
1 parent a97f592 commit 5675f38
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 3 additions & 4 deletions gemet/thesaurus/import_spreadsheet.py
Expand Up @@ -191,12 +191,13 @@ def _create_row_relations(self, i, row):
source_label = row.get("Term") # aka prefLabel
source = self.concepts[source_label.lower()]

rel_columns = False
has_broader = False

for property_type in self.property_types:

# Look for columns specifying relationships
if property_type.name == 'broader':
has_broader = True
target_labels = [
row[key] for key in row.keys()
if 'Broader concept' in key and row[key]
Expand All @@ -213,8 +214,6 @@ def _create_row_relations(self, i, row):
if 'Theme' in key and row[key]
]

if target_labels:
rel_columns = True
else:
print(
'Row {} ({}) has no "{}" relation.'.format(
Expand Down Expand Up @@ -260,7 +259,7 @@ def _create_row_relations(self, i, row):
reverse_relation
)
)
if rel_columns:
if has_broader:
created = source.inherit_groups_and_themes_from_broader()
print(
'Inherited groups and themes from: {}'.format(
Expand Down
2 changes: 2 additions & 0 deletions gemet/thesaurus/models.py
Expand Up @@ -139,6 +139,8 @@ def inherit_groups_and_themes_from_broader(self, version=None):
property_type=relation.property_type,
defaults={'version_added': version, 'status': PENDING}
)
if not relation.reverse:
relation.create_reverse()
if created:
num_created += 1
return num_created
Expand Down

0 comments on commit 5675f38

Please sign in to comment.