From afbbd86f316c2bfa70b86c1c51a4147a83f285ec Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Wed, 23 Aug 2023 14:23:44 +0200 Subject: Able to render group data --- web/webserver.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'web') diff --git a/web/webserver.scm b/web/webserver.scm index 17f5716..a60f477 100755 --- a/web/webserver.scm +++ b/web/webserver.scm @@ -29,6 +29,7 @@ (web gn-uri) (gn db sparql) (gn data species) + (gn data group) (web sxml) (web view doc)) @@ -51,6 +52,14 @@ (,(mk-url "datasets")."Get a list of datasets"))))) +(define (get-id-data id) + "Get data based on identifier id. If it is a taxon return the taxon data, +otherwise search for set/group data" + (let ([taxoninfo (get-expanded-taxon-data id)]) + (if taxoninfo + taxoninfo + (cdr (get-group-data id))))) + ;; ---- REST API web server handler (define (not-found2 request) @@ -104,7 +113,8 @@ (let ([names (get-species-shortnames (get-expanded-species))]) (match (string->list id) [(name ... #\. #\m #\e #\t #\a #\. #\j #\s #\o #\n) (render-json (get-expanded-taxon-meta (list->string name)))] - [(name ... #\. #\j #\s #\o #\n) (render-json (get-expanded-taxon-data (list->string name)))] + [(name ... #\. #\j #\s #\o #\n) (render-json + (get-id-data (list->string name)))] [rest (render-json "NOP")]))) (_ (not-found (request-uri request))) )) -- cgit v1.2.3