Merge pull request #92 from spacemansteve/master

support for new institution field
adsabs · Apr 17, 2019 · 8d6b585 · 8d6b585
2 parents 938928b + 58931fa
commit 8d6b585
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/adsmp/solr_updater.py b/adsmp/solr_updater.py
@@ -81,7 +81,8 @@ def extract_augments_pipeline(db_augments, solrdoc):
             'aff_canonical': db_augments.get('aff_canonical', None),
             'aff_facet': db_augments.get('aff_facet', None),
             'aff_facet_hier': db_augments.get('aff_facet_hier', None),
-            'aff_id': db_augments.get('aff_id', None)}
+            'aff_id': db_augments.get('aff_id', None),
+            'institution': db_augments.get('institution', None)}
 
 
 def extract_fulltext(data, solrdoc):

diff --git a/adsmp/tests/test_solr_updater.py b/adsmp/tests/test_solr_updater.py
@@ -177,7 +177,8 @@ def test_solr_transformer(self):
                                  u'aff_canonical': [u'-', u'-', u'-', u'-'],
                                  u'aff_facet': [u'-', u'-', u'-', u'-'],
                                  u'aff_facet_hier': [u'-', u'-', u'-', u'-'],
-                                 u'aff_id': [u'-', u'-', u'-', u'-']})
+                                 u'aff_id': [u'-', u'-', u'-', u'-'],
+                                 u'institution': [u'-', u'-', u'-', u'-']})
 
         rec = self.app.get_record('bibcode')
         self.assertDictContainsSubset({u'abstract': u'abstract text',
@@ -188,6 +189,7 @@ def test_solr_transformer(self):
              u'aff_facet': [u'-', u'-', u'-', u'-'],
              u'aff_facet_hier': [u'-', u'-', u'-', u'-'],
              u'aff_id': [u'-', u'-', u'-', u'-'],
+             u'institution': [u'-', u'-', u'-', u'-'],
              u'alternate_bibcode': [u'2003adass..12..283B'],
              u'author': [u'Blecksmith, E.', u'Paltani, S.', u'Rots, A.', u'Winkelman, S.'],
              u'author_count': 4,

diff --git a/adsmp/tests/test_tasks.py b/adsmp/tests/test_tasks.py
@@ -134,7 +134,8 @@ def test_task_update_record_augments(self):
                     u"Kurtz, M. K.",
                     u"Stevenson, W. H."
                 ], 
-                u"bibcode": u"1971SPIE...26..187M"
+                u"bibcode": u"1971SPIE...26..187M",
+                u"institution": []
             }
             tasks.task_update_record(AugmentAffiliationResponseRecord(**d))
             db_rec = self.app.get_record(bibcode='1971SPIE...26..187M')

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-git+https://github.com/adsabs/ADSPipelineUtils.git@v1.0.10
+git+https://github.com/adsabs/ADSPipelineUtils.git@v1.0.12
 alembic==0.9.1
 DateTime==4.1.1
 librabbitmq==1.6.1