Changed to use new smlsql interface

[hcoop/zz_old/portal.git] / group.sml

diff --git a/group.sml b/group.sml
index 8bad77f..7c24bbc 100644 (file)
--- a/group.sml
+++ b/group.sml
@@ -10,7 +10,7 @@ type group = {id :int, name : string}
 
 fun mkGroupRow [id, name] =
     {id = C.intFromSql id, name = C.stringFromSql name}
-  | mkGroupRow row = raise Fail ("Bad group row : " ^ makeSet id row)
+  | mkGroupRow row = Init.rowError ("group", row)
 
 fun addGroup name =
     let
@@ -18,8 +18,8 @@ fun addGroup name =
        val id = nextSeq (db, "WebGroupSeq")
     in
        C.dml db ($`INSERT INTO WebGroup (id, name)
-                    VALUES (^id, ^(C.stringToSql name))`);
-       C.intFromSql id
+                    VALUES (^(C.intToSql id), ^(C.stringToSql name))`);
+       id
     end
 
 fun lookupGroup id =
@@ -57,7 +57,7 @@ fun userInGroupNum (usr, grp) =
                                    FROM Membership
                                    WHERE grp = ^(C.intToSql grp)
                                       AND usr = ^(C.intToSql usr)`) of
-            SOME[x] => x <> "0"
+            SOME[x] => not (C.isNull x) andalso C.intFromSql x <> 0
           | _ => false)
     end
 
@@ -70,7 +70,7 @@ fun userInGroupName (usr, grp) =
                                    WHERE name = ^(C.stringToSql grp)
                                       AND usr = ^(C.intToSql usr)
                                        AND grp = id`) of
-            SOME[x] => x <> "0"
+            SOME[x] => not (C.isNull x) andalso C.intFromSql x <> 0
           | _ => false)
     end
 
@@ -106,7 +106,7 @@ fun removeFromGroup (mem : membership) =
 
 fun mkMembershipRow [grp, usr] =
     {grp = C.intFromSql grp, usr = C.intFromSql usr}
-  | mkMembershipRow row = raise Fail ("Bad membership row : " ^ makeSet id row)
+  | mkMembershipRow row = Init.rowError ("membership", row)
 
 fun groupMembers grp =
     C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined FROM Membership, WebUser