Index: openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql	24 Jun 2002 22:37:52 -0000	1.3
+++ openacs-4/packages/forums/sql/postgresql/forums-forums-create.sql	10 Jul 2002 18:30:36 -0000	1.4
@@ -10,34 +10,32 @@
 --
 
 -- privileges
-create function inline_0 ()
-returns integer as '
-begin
+begin;
     -- moderate and post are new privileges
     -- the rest are obvious inheritance
     -- forum creation on a package allows a user to create forums
     -- forum creation on a forum allows a user to create new threads
-    perform acs_privilege__create_privilege(''forum_create'',null,null);
-    perform acs_privilege__create_privilege(''forum_write'',null,null);
-    perform acs_privilege__create_privilege(''forum_delete'',null,null);
-    perform acs_privilege__create_privilege(''forum_read'',null,null);
-    perform acs_privilege__create_privilege(''forum_post'',null,null);
-    perform acs_privilege__create_privilege(''forum_moderate'',null,null);
+    select acs_privilege__create_privilege('forum_create',null,null);
+    select acs_privilege__create_privilege('forum_write',null,null);
+    select acs_privilege__create_privilege('forum_delete',null,null);
+    select acs_privilege__create_privilege('forum_read',null,null);
+    select acs_privilege__create_privilege('forum_post',null,null);
+    select acs_privilege__create_privilege('forum_moderate',null,null);
 
     -- temporarily drop this trigger to avoid a data-change violation 
     -- on acs_privilege_hierarchy_index while updating the child privileges.
 
     drop trigger acs_priv_hier_ins_del_tr on acs_privilege_hierarchy;
 
     -- add children
-    perform acs_privilege__add_child(''create'',''forum_create'');
-    perform acs_privilege__add_child(''write'',''forum_write'');
-    perform acs_privilege__add_child(''delete'',''forum_delete'');
-    perform acs_privilege__add_child(''admin'',''forum_moderate'');
-    perform acs_privilege__add_child(''forum_moderate'',''forum_read'');
-    perform acs_privilege__add_child(''forum_moderate'',''forum_post'');
-    perform acs_privilege__add_child(''forum_write'',''forum_read'');
-    perform acs_privilege__add_child(''forum_write'',''forum_post'');
+    select acs_privilege__add_child('create','forum_create');
+    select acs_privilege__add_child('write','forum_write');
+    select acs_privilege__add_child('delete','forum_delete');
+    select acs_privilege__add_child('admin','forum_moderate');
+    select acs_privilege__add_child('forum_moderate','forum_read');
+    select acs_privilege__add_child('forum_moderate','forum_post');
+    select acs_privilege__add_child('forum_write','forum_read');
+    select acs_privilege__add_child('forum_write','forum_post');
     
     -- re-enable the trigger before the last insert to force the 
     -- acs_privilege_hierarchy_index table to be updated.
@@ -47,14 +45,11 @@
     execute procedure acs_priv_hier_ins_del_tr ();
 
     -- the last one that will cause all the updates
-    perform acs_privilege__add_child(''read'',''forum_read'');
+    select acs_privilege__add_child('read','forum_read');
 
-    return null;
-end;' language 'plpgsql';
+    --return null;
+end;
 
-select inline_0();
-drop function inline_0 ();
-
 create table forums_forums (
     forum_id                        integer
                                     constraint forums_forum_id_nn