Merge 04e717c into bcf323e

adsabs · Mar 1, 2018 · a3c0371 · a3c0371
2 parents bcf323e + 04e717c
commit a3c0371
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/adsmp/solr_updater.py b/adsmp/solr_updater.py
@@ -46,7 +46,7 @@ def extract_data_pipeline(data, solrdoc):
         nedid.append(nid)
         nedtype.append(map_ned_type(ntype))
         ned_object_facet_hier.extend(generate_hier_facet(map_ned_type(ntype), nid))
-    
+
     return dict(reader=reader, 
                 read_count=read_count,
                 cite_read_boost=data.get('boost', 0.0),
@@ -64,7 +64,8 @@ def extract_data_pipeline(data, solrdoc):
                 simbad_object_facet_hier=simbad_object_facet_hier,
                 nedid=nedid,
                 nedtype=nedtype,
-                ned_object_facet_hier=ned_object_facet_hier
+                ned_object_facet_hier=ned_object_facet_hier,
+                citation_count_norm=data.get('citation_count_norm', 1)
                 )
 
 def extract_fulltext(data, solrdoc):

diff --git a/adsmp/tests/test_solr_updater.py b/adsmp/tests/test_solr_updater.py
@@ -167,6 +167,7 @@ def test_solr_transformer(self):
              u'simbad_objects': [u'2419335 sim', u'3111723 sim*'],
              u'ned_objects': [u'2419335 HII', u'3111723 ned*'],
              u'grants': [u'2419335 g', u'3111723 g*'],
+             u'citation_count_norm': .2,
              })
 
         rec = self.app.get_record('bibcode')
@@ -205,6 +206,7 @@ def test_solr_transformer(self):
               u'2014IPTL...26..305A',
               u'2016ITED...63..197G'],
              'citation_count': 6,
+             'citation_count_norm': .2,
              'cite_read_boost': 0.1899999976158142,
              u'data': [u'MAST:3', u'SIMBAD:1'],
              u'data_facet': [u'MAST', u'SIMBAD'],

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