diff --git a/pubs/endecoder.py b/pubs/endecoder.py index ea1fedf..2da16a9 100644 --- a/pubs/endecoder.py +++ b/pubs/endecoder.py @@ -48,7 +48,6 @@ def customizations(record): record = bp.customization.type(record) record = bp.customization.author(record) record = bp.customization.editor(record) - record = bp.customization.journal(record) record = bp.customization.keyword(record) record = bp.customization.page_double_hyphen(record) @@ -99,8 +98,6 @@ class EnDecoder(object): if 'editor' in entry: entry['editor'] = ' and '.join( editor['name'] for editor in entry['editor']) - if 'journal' in entry: - entry['journal'] = entry['journal']['name'] if 'keyword' in entry: entry['keyword'] = ', '.join( keyword for keyword in entry['keyword']) diff --git a/pubs/pretty.py b/pubs/pretty.py index e39de79..8958e36 100644 --- a/pubs/pretty.py +++ b/pubs/pretty.py @@ -8,9 +8,11 @@ from .bibstruct import TYPE_KEY CHARS = re.compile('[{}\n\t\r]') + def sanitize(s): return CHARS.sub('', s) + # should be adaptated to bibtexparser dicts def person_repr(p): raise NotImplementedError @@ -35,7 +37,7 @@ def bib_oneliner(bibdata): authors = short_authors(bibdata) journal = '' if 'journal' in bibdata: - journal = ' ' + bibdata['journal']['name'] + journal = ' ' + bibdata['journal'] elif bibdata[TYPE_KEY] == 'inproceedings': journal = ' ' + bibdata.get('booktitle', '') @@ -44,14 +46,14 @@ def bib_oneliner(bibdata): title=color.dye_out(bibdata.get('title', ''), 'title'), journal=color.dye_out(journal, 'publisher'), year=' ({})'.format(color.dye_out(bibdata['year'], 'year')) - if 'year' in bibdata else '' - )) + if 'year' in bibdata else '' + )) def bib_desc(bib_data): article = bib_data[list(bib_data.keys())[0]] s = '\n'.join('author: {}'.format(p) - for p in article['author']) + for p in article['author']) s += '\n' s += '\n'.join('{}: {}'.format(k, v) for k, v in article.items()) return s