Make author affiliation parsing more generic

Author: Michael-E-Rose

pybliometrics/scopus/author_retrieval.py

@@ -29,7 +29,7 @@ def affiliation_current(self) -> Optional[List[NamedTuple]]:
             affs = self._json.get('affiliation-current')
         else:
             return None
-        return parse_affiliation(affs, self._view)
+        return parse_affiliation(affs or {}, self._view)
 
     @property
     def affiliation_history(self) -> Optional[List[NamedTuple]]:
@@ -44,11 +44,8 @@ def affiliation_history(self) -> Optional[List[NamedTuple]]:
         Note: Unlike on their website, Scopus doesn't provide the periods
         of affiliation.
         """
-        if self._view in ('STANDARD', 'ENHANCED'):
-            affs = chained_get(self._profile, ["affiliation-history", "affiliation"])
-        else:
-            return None
-        return parse_affiliation(affs, self._view)
+        affs = chained_get(self._profile, ["affiliation-history", "affiliation"])
+        return parse_affiliation(affs or {}, self._view)
 
     @property
     def alias(self) -> Optional[List[str]]:
@@ -71,8 +68,8 @@ def cited_by_count(self) -> int:
     def classificationgroup(self) -> Optional[List[Tuple[int, int]]]:
         """List with tuples with form`(subject group ID, number of documents)`."""
         path = ['classificationgroup', 'classifications', 'classification']
-        out = [(int(filter_digits(item['$'])), int(filter_digits(item['@frequency']))) for item in
-           listify(chained_get(self._profile, path, []))]
+        out = [(int(filter_digits(item['$'])), int(filter_digits(item['@frequency'])))
+               for item in listify(chained_get(self._profile, path, []))]
         return out or None
 
     @property

pybliometrics/scopus/utils/parse_content.py

@@ -167,12 +167,14 @@ def parse_affiliation(affs, view):
                 address_part=address.get("address-part"), city=address.get('city'),
                 postal_code=address.get('postal-code'), state=address.get('state'),
                 org_domain=doc.get('org-domain'), org_URL=doc.get('org-URL'))
-            out.append(new)
+            if any(val for val in new):
+                out.append(new)
     elif view == 'LIGHT':
         new = aff(preferred_name=affs.get('affiliation-name'),
                   city=affs.get('affiliation-city'),
                   country=affs.get('affiliation-country'))
-        out.append(new)
+        if any(val for val in new):
+            out.append(new)
 
     return out or None