Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prefer bibgroup and bibgroup_facets from nonbib #159

Merged
merged 3 commits into from
May 6, 2021

Conversation

spacemansteve
Copy link
Contributor

and update pipeline utils release to get latest protobufs

and update pipeline utils release to get latest protobufs
@spacemansteve spacemansteve self-assigned this May 4, 2021
Copy link
Contributor

@marblestation marblestation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes are simple enough, but before merging, please, check the comments, especially the one about python 3 and the requirements.

@@ -1,4 +1,4 @@
adsputils==1.2.8
adsputils==1.3.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this version is python 3 compatible only, which would make this version of master python 3 compatible only. You may want to hold this change for when you decide to deploy master with Python 3.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add python3 support to this pull request.

Comment on lines 327 to 330
if db_record.get('nonbib_data', None) and db_record['nonbib_data'].get('bibgroup'):
out['bibgroup'] = db_record['nonbib_data']['bibgroup']
if db_record.get('nonbib_data', None) and db_record['nonbib_data'].get('bibgroup_facet'):
out['bibgroup_facet'] = db_record['nonbib_data']['bibgroup_facet']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are repeating the same condition verification twice (i.e., db_record.get('nonbib_data', None)), we could have a nested if to remove that dup. Also, given that we are not using the returned value, we could just use if 'nonbib_data' in db_record (as you prefer).

SpacemanSteve added 2 commits May 5, 2021 13:29
also requires changes to file /app/reindex.py which is in BeeHive
@spacemansteve spacemansteve merged commit 14593af into adsabs:master May 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants