From e23f4d764bc93640cb08a7d6ebd7e261fac2cb05 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Tue, 20 Oct 2009 11:05:58 -0400 Subject: Registering for Conference1 --- demo/more/conference.ur | 87 +++++++++++++++++++++++++++++++++++++++++------ demo/more/conference.urp | 1 + demo/more/conference.urs | 17 +++++---- demo/more/conference1.ur | 4 +++ demo/more/conference1.urp | 5 +++ 5 files changed, 98 insertions(+), 16 deletions(-) create mode 100644 demo/more/conference1.ur create mode 100644 demo/more/conference1.urp (limited to 'demo') diff --git a/demo/more/conference.ur b/demo/more/conference.ur index a028bc41..569059c1 100644 --- a/demo/more/conference.ur +++ b/demo/more/conference.ur @@ -1,11 +1,11 @@ -con reviewMeta = fn (db :: Type, widget :: Type) => - {Show : db -> xbody, - Widget : nm :: Name -> xml form [] [nm = widget], - WidgetPopulated : nm :: Name -> db -> xml form [] [nm = widget], - Parse : widget -> db, - Inject : sql_injectable db} - -fun default [t] (sh : show t) (rd : read t) (inj : sql_injectable t) : reviewMeta (t, string) = +con meta = fn (db :: Type, widget :: Type) => + {Show : db -> xbody, + Widget : nm :: Name -> xml form [] [nm = widget], + WidgetPopulated : nm :: Name -> db -> xml form [] [nm = widget], + Parse : widget -> db, + Inject : sql_injectable db} + +fun default [t] (sh : show t) (rd : read t) (inj : sql_injectable t) : meta (t, string) = {Show = txt, Widget = fn [nm :: Name] => , WidgetPopulated = fn [nm :: Name] n => @@ -24,10 +24,77 @@ val bool = {Show = txt, Inject = _} functor Make(M : sig + con paper :: {(Type * Type)} + constraint [Id, Title] ~ paper + val paper : $(map meta paper) + con review :: {(Type * Type)} - val review : $(map reviewMeta review) + constraint [Paper, User] ~ review + val review : $(map meta review) end) = struct - fun main () = return + table user : {Id : int, Nam : string, Password : string, Chair : bool, OnPc : bool} + PRIMARY KEY Id, + CONSTRAINT Nam UNIQUE Nam + sequence userId + + con paper = [Id = int, Title = string] ++ map fst M.paper + table paper : paper + PRIMARY KEY Id + sequence paperId + + con review = [Paper = int, User = int] ++ map fst M.review + table review : review + PRIMARY KEY (Paper, User), + CONSTRAINT Paper FOREIGN KEY Paper REFERENCES paper(Id), + CONSTRAINT User FOREIGN KEY User REFERENCES user(Id) + sequence reviewId + + cookie login : {Id : int, Password : string} + + fun checkLogin () = + r <- getCookie login; + case r of + None => return None + | Some r => + oneOrNoRows1 (SELECT user.Id, user.Nam, user.Chair, user.OnPc + FROM user + WHERE user.Id = {[r.Id]} + AND user.Password = {[r.Password]}) + + fun doRegister r = + n <- oneRowE1 (SELECT COUNT( * ) AS N + FROM user + WHERE user.Nam = {[r.Nam]}); + if n > 0 then + register (Some "Sorry; that username is taken.") + else + id <- nextval userId; + dml (INSERT INTO user (Id, Nam, Password, Chair, OnPc) + VALUES ({[id]}, {[r.Nam]}, {[r.Password]}, FALSE, FALSE)); + setCookie login {Id = id, Password = r.Password}; + main () + + and register msg = return +

Registering a New Account

+ + {case msg of + None => + | Some msg =>
{[msg]}
} + +
+ + + +
Username:
Password:
+
+ + and main () = + me <- checkLogin (); + return + {case me of + None =>
  • Register for access
  • + | Some {Nam = name, ...} => Welcome, {[name]}!} +
    end diff --git a/demo/more/conference.urp b/demo/more/conference.urp index 399721d4..51a63cb0 100644 --- a/demo/more/conference.urp +++ b/demo/more/conference.urp @@ -1,2 +1,3 @@ +$/option conference diff --git a/demo/more/conference.urs b/demo/more/conference.urs index 696b8b32..aecdf143 100644 --- a/demo/more/conference.urs +++ b/demo/more/conference.urs @@ -1,18 +1,23 @@ -con reviewMeta = fn (db :: Type, widget :: Type) => +con meta = fn (db :: Type, widget :: Type) => {Show : db -> xbody, Widget : nm :: Name -> xml form [] [nm = widget], WidgetPopulated : nm :: Name -> db -> xml form [] [nm = widget], Parse : widget -> db, Inject : sql_injectable db} -val int : reviewMeta (int, string) -val float : reviewMeta (float, string) -val string : reviewMeta (string, string) -val bool : reviewMeta (bool, bool) +val int : meta (int, string) +val float : meta (float, string) +val string : meta (string, string) +val bool : meta (bool, bool) functor Make(M : sig + con paper :: {(Type * Type)} + constraint [Id, Title] ~ paper + val paper : $(map meta paper) + con review :: {(Type * Type)} - val review : $(map reviewMeta review) + constraint [Paper, User] ~ review + val review : $(map meta review) end) : sig val main : unit -> transaction page diff --git a/demo/more/conference1.ur b/demo/more/conference1.ur new file mode 100644 index 00000000..8d263a3c --- /dev/null +++ b/demo/more/conference1.ur @@ -0,0 +1,4 @@ +open Conference.Make(struct + val paper = {} + val review = {} + end) diff --git a/demo/more/conference1.urp b/demo/more/conference1.urp new file mode 100644 index 00000000..c78219c4 --- /dev/null +++ b/demo/more/conference1.urp @@ -0,0 +1,5 @@ +library conference +database dbname=conf1 +sql conf1.sql + +conference1 -- cgit v1.2.3