From 0d90c71c287a20a775a5dc8f197ac3646c02ff36 Mon Sep 17 00:00:00 2001 From: Munyoki Kilyungi Date: Fri, 3 Nov 2023 17:23:07 +0300 Subject: Refactor route and metadata retrieval process for dataset details. * wqflask/wqflask/views.py (get_dataset): Rename "/dataset..." -> "/datasets...". Remove url parsing for metadata keys since we use json-ld now. Remove pull-right check. Only pass the metadata to the template. Signed-off-by: Munyoki Kilyungi --- wqflask/wqflask/views.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 22b7384c..3827a938 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -1098,27 +1098,17 @@ def display_generif_page(symbol): ) -@app.route("/dataset/", methods=('GET',)) +@app.route("/datasets/", methods=('GET',)) def get_dataset(name): metadata = requests.get( urljoin( GN3_LOCAL_URL, - f"/api/metadata/dataset/{name}") + f"/api/metadata/datasets/{name}") ).json() - metadata = {k.split("/")[-1].split("#")[-1]: v for k, v in metadata.items()} - float_p = "" - if any([metadata.get("description"), - metadata.get("hasExperimentDesignInfo"), - metadata.get("hasCaseInfo"), - metadata.get("hasCaseInfo"), - metadata.get("hasPlatformInfo"), - metadata.get("hasDataProcessingInfo"), metadata.get("notes")]): - float_p = " pull-right" return render_template( "dataset.html", name=name, - dataset=metadata, - float_p=float_p + dataset=metadata ) @app.route("/dataset/search", methods=('POST',)) -- cgit 1.4.1