diff options
| -rw-r--r-- | gn/db/mysql.scm | 8 | ||||
| -rw-r--r-- | web/view/view.scm | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gn/db/mysql.scm b/gn/db/mysql.scm index 0d7cd40..223b5fd 100644 --- a/gn/db/mysql.scm +++ b/gn/db/mysql.scm @@ -32,23 +32,23 @@ ;; (display "===> OPENING DB") ;; (newline) (let [(db (dbi-open "mysql" "webqtlout:webqtlout:db_webqtl:tcp:127.0.0.1:3306"))] - (ensure db) + (ensure db "Can't open connection") db ))) (define (call-with-db thunk) (thunk (db-open))) -(define (ensure db) +(define (ensure db msg1) "Use DBI-style handle to report an error. On error the program will stop." (match (dbi-get_status db) ((stat . msg) (if (= stat 0) #t (begin (display "SQL Connection ERROR! ") - (display msg) + (display (string-append msg1 " - " msg) (newline) - (assert stat)))))) + (assert #f))))))) (define (has-result? db) "Return #t or #f if result is valid" diff --git a/web/view/view.scm b/web/view/view.scm index 4300863..6b2ef22 100644 --- a/web/view/view.scm +++ b/web/view/view.scm @@ -15,7 +15,7 @@ #:export (view-brand)) -(define (view-aging) +(define (view-aging-home) (aging-html #:info `( ,(markdown-github->sxml "genenetwork/gn-docs/general/brand/aging/home.md") @@ -44,8 +44,12 @@ data to benefit from the power of integrated datasets, please contact:") (img (@ (src "/static/images/CMOR.jpg") (width "1000")))))) (define* (view-brand path) - (match path - ("aging" (view-aging)) + (match (pk path) + ("aging/UMHET-3" (aging-html #:info + `(,(markdown-github->sxml "genenetwork/gn-docs/general/brand/aging/home.md")))) + ("aging/umhet-3" (aging-html #:info + `(,(markdown-github->sxml "genenetwork/gn-docs/general/brand/aging/home.md")))) + ("aging" (view-aging-home)) ("gnqa" (default-gn-template "genenetwork/gn-docs/general/brand/gnqa/gnqa.md" "GeneNetwork Question and Answer System")) |