Merge pull request #37 from okfde/updater-persons

Persons update fixes
okfde · Nov 6, 2014 · 61c485a · 61c485a
2 parents 939964b + 706ee6d
commit 61c485a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/offenesparlament/data/lib/reference.py b/offenesparlament/data/lib/reference.py
@@ -47,10 +47,15 @@ def resolve(dataset_name, key):
             ENTITIES[cache_tpl] = obj
         obj = ENTITIES[cache_tpl]
         if isinstance(obj, Dataset.Invalid):
+            log.error("InvalidReference (Invalid) for %s", obj)
             raise InvalidReference()
         if isinstance(obj, Dataset.NoMatch):
+            log.error("BedReference (NoMatch) for %s", obj)
             raise BadReference()
         return obj.name
+    except:
+        log.error("Resolve did not work for %s" % key)
+        pass
     finally:
         LOCK.release()
 

diff --git a/offenesparlament/data/persons/__init__.py b/offenesparlament/data/persons/__init__.py
@@ -13,7 +13,11 @@ def process_person(engine, indexer, url, force=False):
     try:
         data = scrape_mdb(engine, url, force=force)
         make_fingerprint(engine, data)
-        parse_angaben(engine, data)
+        try:
+            parse_angaben(engine, data)
+        except:
+            log.warn("Angaben parse did not work")
+            pass
 
         data = fetch_row(engine, 'person', mdb_id=data['mdb_id'])
         person = load_person(engine, data)

diff --git a/offenesparlament/data/persons/resolve.py b/offenesparlament/data/persons/resolve.py
@@ -12,8 +12,13 @@
 def make_fingerprint(engine, person):
     try:
         long_name = make_long_name(person)
-        long_name = resolve_person(long_name)
-        log.info(" -> %s" % long_name.strip())
+        try:
+            long_name = resolve_person(long_name)
+            log.info(" -> %s" % long_name.strip())
+        except:
+            log.error("Resolve did not work")
+            pass
+
         Person = sl.get_table(engine, 'person')
         sl.upsert(engine, Person, {
             'fingerprint': long_name,
@@ -27,5 +32,6 @@ def make_fingerprint(engine, person):
             }, unique=['mdb_id'])
         person['fingerprint'] = long_name
     except BadReference:
+        log.error("Bad Reference %s", person)
         pass