Skip to content
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

Jump to bottom

Ensure historical subdivision is always added for FMIS entry #24

Merged
merged 1 commit into from
Jun 8, 2017
Merged

Ensure historical subdivision is always added for FMIS entry #24

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion KMB/kmb_massload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def kmb_wrapper(idno, log):
try:
f = urllib2.urlopen(url)
except urllib2.HTTPError as e:
error_message = '{1}: {2}'.format(e, url)
error_message = '{0}: {1}'.format(e, url)
A['problem'].append(error_message)
log.write('{0} -- {1}'.format(idno, error_message))
else:
Expand Down
7 changes: 5 additions & 2 deletions KMB/make_KMB_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,15 +673,18 @@ def make_default_fmis_category(self, cache):
muni_cat = self.municipal_subcategory(
'Archaeological monuments in {}', cache)

# add the modern subdivision
if muni_cat:
self.needs_place_cat = False
self.content_cats.add(muni_cat)
else:
self.content_cats.add(
'Archaeological monuments in {}'.format(self.landskap))
self.content_cats.add(
'Archaeological monuments in {} County'.format(self.lan))

# add the historical subdivision
self.content_cats.add(
'Archaeological monuments in {}'.format(self.landskap))

def make_default_bbr_category(self, cache):
"""
Set BBR default categories based on municipality.
Expand Down