summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2020-07-23 19:35:58 -0700
committerBryan Newbold <bnewbold@robocracy.org>2020-07-30 18:25:54 -0700
commit9b6903cd8385107ee354158031e92bc89f2be272 (patch)
treea1effe64afb608ae452fa597b0f330cbeb582a3d
parentb0dd685479b6d92d5c85604180e710b13dfc88d8 (diff)
downloadfatcat-9b6903cd8385107ee354158031e92bc89f2be272.tar.gz
fatcat-9b6903cd8385107ee354158031e92bc89f2be272.zip
web: move random article enrichment to special case
Instead of always enriching container entities with random articles, only do so for the primary container view.
-rw-r--r--python/fatcat_web/entity_helpers.py6
-rw-r--r--python/fatcat_web/routes.py5
2 files changed, 5 insertions, 6 deletions
diff --git a/python/fatcat_web/entity_helpers.py b/python/fatcat_web/entity_helpers.py
index e3d538e0..695ac426 100644
--- a/python/fatcat_web/entity_helpers.py
+++ b/python/fatcat_web/entity_helpers.py
@@ -3,7 +3,7 @@ from flask import abort
from fatcat_openapi_client.rest import ApiException, ApiValueError
from fatcat_tools.transforms import *
from fatcat_web import app, api
-from fatcat_web.search import get_elastic_container_stats, get_elastic_container_random_releases
+from fatcat_web.search import get_elastic_container_stats
from fatcat_web.hacks import strip_extlink_xml, wayback_suffix
def enrich_container_entity(entity):
@@ -14,9 +14,7 @@ def enrich_container_entity(entity):
entity._stats = None
try:
entity._stats = get_elastic_container_stats(entity.ident, issnl=entity.issnl)
- #if entity._stats['total'] > 0:
- entity._random_releases = get_elastic_container_random_releases(entity.ident)
- except Exception as e:
+ except ValueError as e:
app.log.error(e)
pass
return entity
diff --git a/python/fatcat_web/routes.py b/python/fatcat_web/routes.py
index 93522fec..0fb0852c 100644
--- a/python/fatcat_web/routes.py
+++ b/python/fatcat_web/routes.py
@@ -14,7 +14,7 @@ from fatcat_tools.normal import *
from fatcat_web import app, api, auth_api, priv_api, mwoauth, Config
from fatcat_web.auth import handle_token_login, handle_logout, load_user, handle_ia_xauth, handle_wmoauth
from fatcat_web.cors import crossdomain
-from fatcat_web.search import ReleaseQuery, GenericQuery, do_release_search, do_container_search, get_elastic_entity_stats, get_elastic_container_stats, get_elastic_container_histogram_legacy, get_elastic_container_preservation_by_year, get_elastic_container_preservation_by_volume, get_elastic_container_preservation_by_type, FatcatSearchError
+from fatcat_web.search import ReleaseQuery, GenericQuery, do_release_search, do_container_search, get_elastic_entity_stats, get_elastic_container_stats, get_elastic_container_histogram_legacy, get_elastic_container_preservation_by_year, get_elastic_container_preservation_by_volume, get_elastic_container_preservation_by_type, get_elastic_container_random_releases, FatcatSearchError
from fatcat_web.entity_helpers import *
from fatcat_web.graphics import *
from fatcat_web.kafka import *
@@ -200,9 +200,10 @@ def generic_entity_view(entity_type, ident, view_template):
metadata.pop('extra')
entity._metadata = metadata
+ if view_template == "container_view.html":
+ entity._random_releases = get_elastic_container_random_releases(entity.ident)
if view_template == "container_view_coverage.html":
entity._type_preservation = get_elastic_container_preservation_by_type(ident)
- print(entity._type_preservation)
return render_template(view_template, entity_type=entity_type, entity=entity, editgroup_id=None)