about summary refs log tree commit diff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/webserver.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/web/webserver.scm b/web/webserver.scm
index 5b1e024..dae235a 100644
--- a/web/webserver.scm
+++ b/web/webserver.scm
@@ -68,8 +68,11 @@ otherwise search for set/group data"
   "Return a list of published datasets by their record ID. We add the dataset ID and phenotype ID for quick reference"
   (list->vector (get-bxd-publish-list)))
 
-(define* (get-bxd-publish-values dataid #:key used-for-mapping?)
-  (get-bxd-publish-name-value-dict dataid #:used-for-mapping? used-for-mapping?))
+(define* (get-bxd-publish-dataid-values dataid #:optional used-for-mapping?)
+  (get-bxd-publish-dataid-name-value-dict dataid used-for-mapping?))
+
+(define* (get-bxd-publish-values dataid #:optional used-for-mapping?)
+  (get-bxd-publish-name-value-dict dataid used-for-mapping?))
 
 (define (get-gene-aliases genename)
   "Return a vector of aliases for genename."
@@ -257,15 +260,20 @@ otherwise search for set/group data"
      (render-brand path)) ; branding route for /home/aging, /home/msk etc
     (('GET "dataset" "bxd-publish" "list")
      (render-json (get-bxd-publish)))
+    (('GET "dataset" "bxd-publish" "dataid" "values" page)
+     (match (get-extension page)
+       (".json"
+        (render-json (get-bxd-publish-dataid-values (basename page ".json"))))
+       (else    (display "ERROR: unknown file extension"))))
     (('GET "dataset" "bxd-publish" "values" page)
      (match (get-extension page)
        (".json"
         (render-json (get-bxd-publish-values (basename page ".json"))))
-       (".tsv"  (render-string "TEST1\nTEST2"))
+       ;; (".tsv"  (render-string "TEST1\nTEST2"))
        ;; (".gemma" (render-string (string-join (gemma-pheno-txt "BXD" (get-bxd-publish-values (basename page ".gemma"))) "")))
        (else    (display "ERROR: unknown file extension"))))
     (('GET "dataset" "bxd-publish" "mapping" "values" (string-append dataid ".json"))
-     (render-json (get-bxd-publish-values dataid  #:used-for-mapping? #t)))
+     (render-json (get-bxd-publish-values dataid #t)))
     (('GET "doc" "species.html")
      (render-doc "doc" "species.html"
                  (get-species-meta)))