Adding test infrastructure and reorganizing modules

1 files changed, 1 insertions, 16 deletions

diff --git a/web/webserver.scm b/web/webserver.scm
index 26b4a75..485d334 100755
--- a/web/webserver.scm
+++ b/web/webserver.scm
@@ -51,21 +51,6 @@
      (,(mk-url "datasets")."Get a list of datasets")))))
 
 
-
-; (define (wd-species-info wd)
-;  )
-
-
-(define (get-expanded-taxon-meta id)
-  "Get information on a specific species, e.g. mouse"
-  `(("info" . ,id)
-    ("doc" . ,(mk-doc id))
-    ("meta" . ,(mk-meta id))
-    ("data" . ,(mk-data id))
-    ("up" . ,(mk-meta "species"))
-  ))
-
-
 ;; ---- REST API web server handler
 
 (define (not-found2 request)
@@ -119,7 +104,7 @@
      (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-species1 (list->string name)))]
+	 [(name ... #\. #\j #\s #\o #\n) (render-json (get-expanded-taxon-data (list->string name)))]
 	 [rest (render-json "NOP")])))
     (_ (not-found (request-uri request)))
     ))