listing citations, known and unknown

1 files changed, 8 insertions, 6 deletions

diff --git a/scraper/s2-geocode-server.py b/scraper/s2-geocode-server.py
index c9219fe1..0a4dc06c 100644
--- a/scraper/s2-geocode-server.py
+++ b/scraper/s2-geocode-server.py
@@ -14,6 +14,8 @@ load_dotenv()
 from util import *
 
 locations_worksheet = fetch_worksheet('paper_locations')
+paper_lookup = fetch_google_lookup('citation_lookup')
+addresses = AddressBook()
 
 app = Flask(__name__, static_url_path="/reports", static_folder=os.path.abspath("reports"))
 
@@ -31,7 +33,6 @@ def page_not_found(e):
 
 @app.route('/api/institutions', methods=['GET'])
 def list_locations():
-  addresses = AddressBook()
   return jsonify({
     'entities': addresses.entities,
     'lookup': addresses.lookup,
@@ -39,10 +40,6 @@ def list_locations():
 
 @app.route('/api/papers', methods=['GET'])
 def list_papers():
-  lookup_keys, lines = fetch_google_sheet('citation_lookup')
-  paper_lookup = {}
-  for line in lines:
-    paper_lookup[line[0]] = line
   return jsonify({
     'papers': paper_lookup,
   })
@@ -50,7 +47,12 @@ def list_papers():
 @app.route('/api/address/<sha256>', methods=['GET'])
 def find_address(sha256):
   worksheet = fetch_worksheet('paper_locations')
-  cell = worksheet.find(sha256)
+  try:
+    cell = worksheet.find(sha256)
+  except:
+    return jsonify({
+      'error': 'no_match'
+    })
   if cell and cell.row:
     keys = worksheet.row_values(1)
     values_list = worksheet.row_values(cell.row)