Index: cgisetup/pages/index.scm ================================================================== --- cgisetup/pages/index.scm +++ cgisetup/pages/index.scm @@ -1,7 +1,10 @@ ;; (require-library chicken) ;; (import chicken) + +(include "../../pgdb.scm") +(declare (uses pgdb)) ;; (include "src/common_records.scm") (include "pages/index_ctrl.scm") (define (pages:index session db shared) ;; (s:log " HTTP_COOKIE=" (get-environment-variable "HTTP_COOKIE")) Index: cgisetup/pages/index_view.scm ================================================================== --- cgisetup/pages/index_view.scm +++ cgisetup/pages/index_view.scm @@ -1,21 +1,24 @@ ;; Copyright 2007-2008, Matthew Welland. Megatest All rights reserved. ;; ;; index - (list - "" - (s:html - (s:title (conc "Megatest ")) - (s:head - index:kickstart-junk - ) - (s:body - (s:div 'class "grid flex" 'id "top_of_page" - ;; add visible to columns to help visualize them e.g. "col_12 visible" - ;; BEGINNING OF HEADER - (s:div 'class "col_12" - "stuff goes here")) - index:jquery - index:javascript - ))) +(let ((dbh (s:db))) + (list + "" + (s:html + (s:title (conc "Megatest ")) + (s:head + index:kickstart-junk + ) + (s:body + (s:div 'class "grid flex" 'id "top_of_page" + ;; add visible to columns to help visualize them e.g. "col_12 visible" + ;; BEGINNING OF HEADER + (s:div 'class "col_12" + (map (lambda (area) + (s:p "data=" (conc area))) + (pgdb:get-tests dbh "%")) + index:jquery + index:javascript + )))))) Index: pgdb.scm ================================================================== --- pgdb.scm +++ pgdb.scm @@ -53,14 +53,14 @@ (define (pgdb:add-area dbh area-name area-path) (dbi:exec dbh "INSERT INTO areas (area_name,area_path) VALUES (?,?)" area-name area-path)) (define (pgdb:get-areas dbh) - (map - (lambda (row) - (print "row: " row)) - (dbi:get-rows dbh "SELECT id,area_name,area_path,last_sync FROM areas;"))) + ;; (map + ;; (lambda (row) + ;; (print "row: " row)) + (dbi:get-rows dbh "SELECT id,area_name,area_path,last_sync FROM areas;")) ;; ) ;; given an area_path get the area info ;; (define (pgdb:get-area-by-path dbh area-path) (dbi:get-one-row dbh "SELECT id,area_name,area_path,last_sync FROM areas WHERE area_path=?;" area-path)) @@ -158,5 +158,13 @@ run_id=?,test_name=?,item_path=?,state=?,status=?,host=?,cpuload=?,diskfree=?,uname=?,rundir=?,final_logf=?,run_duration=?,comment=?,event_time=?,archived=? WHERE id=?;" run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived test-id)) + +(define (pgdb:get-tests dbh target-patt) + (dbi:get-rows + dbh + "SELECT t.id,t.run_id,t.test_name,t.item_path,t.state,t.status,t.host,t.cpuload,t.diskfree,t.uname,t.rundir,t.final_logf,t.run_duration,t.comment,t.event_time,t.archived, + r.id,r.target,r.ttype_id,r.run_name,r.state,r.status,r.owner,r.event_time,r.comment + FROM tests AS t INNER JOIN runs AS r ON t.run_id=r.id + WHERE r.target LIKE ?;" target-patt))