diff options
| author | bnewbold <bnewbold@archive.org> | 2021-04-13 19:02:19 +0000 |
|---|---|---|
| committer | bnewbold <bnewbold@archive.org> | 2021-04-13 19:02:19 +0000 |
| commit | 7ca9a96705c5a2da4fe56a8cab6aa7653dac4ea5 (patch) | |
| tree | 2c7ff27a124e87d9d4dd7f71294f79609717236b /python/fatcat_tools | |
| parent | 83ae1d85d093f1f37bba74283b1d689bb1f1c346 (diff) | |
| parent | 34afb00666814d7bcb5c29085a25353986ea805d (diff) | |
| download | fatcat-7ca9a96705c5a2da4fe56a8cab6aa7653dac4ea5.tar.gz fatcat-7ca9a96705c5a2da4fe56a8cab6aa7653dac4ea5.zip | |
Merge branch 'bnewbold-ui-tweaks-202104' into 'master'
Misc UI tweaks (2021-04)
See merge request webgroup/fatcat!103
Diffstat (limited to 'python/fatcat_tools')
| -rw-r--r-- | python/fatcat_tools/transforms/csl.py | 6 | ||||
| -rw-r--r-- | python/fatcat_tools/transforms/elasticsearch.py | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/python/fatcat_tools/transforms/csl.py b/python/fatcat_tools/transforms/csl.py index ba199efb..15bb369f 100644 --- a/python/fatcat_tools/transforms/csl.py +++ b/python/fatcat_tools/transforms/csl.py @@ -33,19 +33,19 @@ def release_to_csl(entity): if contrib.creator: # Default to "local" (publication-specific) metadata; fall back to # creator-level - family = contrib.surname or contrib.creator.surname or (contrib.raw_name and contrib.raw_name.split()[-1]) + family = contrib.creator.surname or contrib.surname or (contrib.raw_name and contrib.raw_name.split()[-1]) if not family: # CSL requires some surname (family name) continue c = dict( family=family, - given=contrib.given_name or contrib.creator.given_name, + given=contrib.creator.given_name or contrib.given_name, #dropping-particle #non-dropping-particle #suffix #comma-suffix #static-ordering - literal=contrib.raw_name or contrib.creator.display_name, + literal=contrib.creator.display_name or contrib.raw_name, #parse-names, # role must be defined; default to author role=contrib.role or 'author', diff --git a/python/fatcat_tools/transforms/elasticsearch.py b/python/fatcat_tools/transforms/elasticsearch.py index 4bf9091a..331ca4e7 100644 --- a/python/fatcat_tools/transforms/elasticsearch.py +++ b/python/fatcat_tools/transforms/elasticsearch.py @@ -113,10 +113,13 @@ def release_to_elasticsearch(entity: ReleaseEntity, force_bool: bool = True) -> contrib_affiliations = [] creator_ids = [] for c in (release.contribs or []): - if c.raw_name: + if c.creator and c.creator.display_ame: + contrib_names.append(c.creator.display_ame) + elif c.raw_name: contrib_names.append(c.raw_name) elif c.surname: contrib_names.append(c.surname) + if c.creator_id: creator_ids.append(c.creator_id) if c.raw_affiliation: |