Ensure historical subdivision is always added for FMIS entry (#24)

Also: * fix formatting error in kmb_massload Task: [T167350](https://phabricator.wikimedia.org/T167350)
lokal-profil · Jun 8, 2017 · 7c367b7 · 7c367b7
1 parent 838dbfd
commit 7c367b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/KMB/kmb_massload.py b/KMB/kmb_massload.py
@@ -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:

diff --git a/KMB/make_KMB_info.py b/KMB/make_KMB_info.py
@@ -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.