1118 solr query fl (#596)

* update field list in solr and corrected dups in req * update field list in solr and corrected dups in req * add missing fields for phoentics bucket
bcgov · Aug 23, 2019 · 7209e38 · 7209e38
1 parent 36a58e5
commit 7209e38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/api/namex/analytics/solr.py b/api/namex/analytics/solr.py
@@ -74,6 +74,7 @@ class SolrQueries:
             '&q=cobrs_phonetic:{start_str}'
             '&wt=json'
             '&start={start}&rows={rows}'
+            '&fl=source,id,name,score,start_date,jurisdiction'
             '&sort=score%20desc,txt_starts_with%20asc'
             '&fq=-{exact_name}'
             '{synonyms_clause}',
@@ -82,6 +83,7 @@ class SolrQueries:
             '&q=dblmetaphone_name:{start_str}'
             '&wt=json'
             '&start={start}&rows={rows}'
+            '&fl=source,id,name,score,start_date,jurisdiction'
             '&sort=score%20desc,txt_starts_with%20asc'
             '&fq=-{exact_name}'
             '{synonyms_clause}',
@@ -1087,5 +1089,4 @@ def keep_phonetic_match(cls, word, query):
     @classmethod
     def keep_candidate(cls, candidate, name, names):
         if len([doc['id'] for doc in names if doc['id'] == candidate['id']]) == 0:
-            names.append({'name': name, 'id': candidate['id'], 'source': candidate['source']})
-
+            names.append({'name': name, 'id': candidate['id'], 'source': candidate['source'], 'jurisdiction': candidate['jurisdiction'],'start_date': candidate['start_date'] })
diff --git a/api/requirements/prod.txt b/api/requirements/prod.txt
@@ -9,17 +9,6 @@ Flask-Marshmallow<3
 flask-jwt-oidc>=0.1.5
 python-dotenv==0.8.2
 psycopg2-binary
-gunicorn
-Flask
-Flask-Migrate
-Flask-Script
-Flask-Moment
-Flask-SQLAlchemy
-Flask-RESTplus
-Flask-Marshmallow<3
-flask-jwt-oidc>=0.1.5
-python-dotenv==0.8.2
-psycopg2-binary
 marshmallow==2.19.2
 marshmallow-sqlalchemy
 cx_Oracle