コントローラがTableも返せるようにした

mzp · Jan 11, 2010 · 902ec90 · 902ec90
1 parent ab73460
commit 902ec90
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/controller.ml b/controller.ml
@@ -4,6 +4,7 @@ open StdLabels
 type t =
     String of string
   | Bool   of bool
+  | Table  of (string * t) list list
 
 let find_package module_ configs =
   let config =

diff --git a/controller.mli b/controller.mli
@@ -1,5 +1,6 @@
 type t =
     String of string
   | Bool   of bool
+  | Table  of (string * t) list list
 
 val format : Config.t list -> Search.t -> (string * t) list
diff --git a/main.ml b/main.ml
@@ -10,7 +10,15 @@ let rec to_var = function
     Controller.String s ->
       Template.VarString s
   | Controller.Bool b ->
-      Template.VarConditional b
+       Template.VarConditional b
+  | Controller.Table rows ->
+      Template.VarTable begin
+	List.map rows ~f:begin fun row ->
+	  List.map row ~f:begin fun (name, cell) ->
+	    (name, to_var cell)
+	  end
+	end
+      end
 
 let index_page (cgi : cgi) =
   cgi#template @@ template "templates/index.html"