Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 20 additions & 9 deletions importer/DiMuHarvester.py
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,10 @@ def map_place_role(self, role):
mapped_roles = {
"21": 'depicted_place',
"25": 'view_over',
"39": 'used_at_location',
"31": False, # Tidigare ägare, ort
"41": False, # Givare, ort
"51": False, # Säljare till museet, ort
"10": False # Fotograf, ort
}
if role.get('code') in mapped_roles:
Expand All @@ -599,10 +603,15 @@ def map_person_role(self, role):
"""
# map to false to tell the calling function to discard that entry
mapped_roles = {
'11K': 'creator', # artist
'11K': 'creator', # Artist
'10': 'creator', # Fotograf
'21': 'depicted', # Avbildad - namn
'17': False, # beställare
'17': False, # Beställare
'31': False, # Tidigare ägare
'39': False, # Brukare
'41': False, # Givare till museet
'45': False, # Förmedlare
'51': False, # Säljare till museet
'74': False # Historisk händelse, namn med anknytning till föremålet # noqa
}
if role.get('code') in mapped_roles:
Expand Down Expand Up @@ -697,13 +706,15 @@ def parse_event_wrap(self, data, event_wrap_data):

# store non-creation events but log the types
data['events'] = []
for event in event_wrap_data.get('events'):
event_type = event.get('eventType')
if event_type not in creation_types:
self.log.write(
'{}: found a new event type "{}".'.format(
self.active_uuid, event_type))
data['events'].append(self.parse_event(event))
event_data = event_wrap_data.get('events')
if event_data:
for event in event_wrap_data.get('events'):
event_type = event.get('eventType')
if event_type not in creation_types:
self.log.write(
'{}: found a new event type "{}".'.format(
self.active_uuid, event_type))
data['events'].append(self.parse_event(event))

# store Historik
data['history'] = None
Expand Down
3 changes: 2 additions & 1 deletion importer/make_glam_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,8 @@ def get_original_description(self):

role_dict = {
'depicted_place': 'Avbildad plats',
'view_over': 'Vy över'
'view_over': 'Vy över',
'used_at_location': 'Brukningsort'
}
if self.depicted_place:
places = self.geo_data.get('labels').values()
Expand Down