Index: openacs-4/packages/dotlrn/sql/postgresql/dotlrn-admins-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/Attic/dotlrn-admins-package-create.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/sql/postgresql/dotlrn-admins-package-create.sql	29 Mar 2002 19:14:44 -0000	1.2
+++ openacs-4/packages/dotlrn/sql/postgresql/dotlrn-admins-package-create.sql	2 Jul 2002 18:40:08 -0000	1.3
@@ -21,21 +21,23 @@
 -- @version $Id$
 --
 
-select define_function_args ('dotlrn_admin_profile_rel__new','rel_id,id,rel_type;dotlrn_admin_profile_rel,group_id,user_id,creation_user,creation_ip');
+select define_function_args ('dotlrn_admin_profile_rel__new','rel_id,user_id,portal_id,theme_id,id,rel_type;dotlrn_admin_profile_rel,group_id,creation_user,creation_ip');
 
 select define_function_args ('dotlrn_admin_profile_rel__delete','rel_id');
 
 
-create function dotlrn_admin_profile_rel__new(integer,varchar,varchar,integer,integer,integer,varchar)
+create function dotlrn_admin_profile_rel__new(integer,integer,integer,integer,integer,varchar,integer,integer,varchar)
 returns integer as '
 DECLARE
         p_rel_id                alias for $1;
-        p_id                        alias for $2;
-        p_rel_type                alias for $3;
-        p_group_id                alias for $4;
-        p_user_id                alias for $5;
-        p_creation_user                alias for $6;
-        p_creation_ip                alias for $7;
+        p_user_id		alias for $2;
+        p_portal_id		alias for $3;
+        p_theme_id		alias for $4;
+        p_id			alias for $5;
+        p_rel_type		alias for $6;
+        p_group_id              alias for $7;
+        p_creation_user		alias for $8;
+        p_creation_ip		alias for $9;
         v_rel_id                dotlrn_user_profile_rels.rel_id%TYPE;
         v_group_id              groups.group_id%TYPE;
 BEGIN
@@ -51,11 +53,12 @@
         end if;
 
         v_rel_id := dotlrn_user_profile_rel__new(
-            p_rel_id,
+            v_rel_id,
+            p_user_id,
+	    p_portal_id,
+            p_theme_id,
             p_id,
             p_rel_type,
-            v_group_id,
-            p_user_id,
             p_creation_user,
             p_creation_ip
         );
@@ -86,72 +89,3 @@
 ' language 'plpgsql';
 
 
--- full admins
-
-select define_function_args('dotlrn_full_admin_profile_rel__new','rel_id,portal_id,theme_id,id,rel_type,group_id,user_id,creation_user,creation_ip');
-
-select define_function_args('dotlrn_full_admin_profile_rel__delete','rel_id');
-
-
-create function dotlrn_full_admin_profile_rel__new(integer,integer,integer,varchar,varchar,integer,integer,integer,varchar)
-returns integer as '
-DECLARE
-        p_rel_id                        alias for $1;
-        p_portal_id                        alias for $2;
-        p_theme_id                        alias for $3;
-        p_id                                alias for $4;
-        p_rel_type                        alias for $5;
-        p_group_id                        alias for $6;
-        p_user_id                        alias for $7;
-        p_creation_user                        alias for $8;
-        p_creation_ip                        alias for $9;
-        v_rel_id                dotlrn_full_user_profile_rels.rel_id%TYPE;
-        v_group_id              groups.group_id%TYPE;
-BEGIN
-        if p_group_id is null then
-            select min(group_id)
-            into v_group_id
-            from profiled_groups
-            where profile_provider = (select min(impl_id)
-                                      from acs_sc_impls
-                                      where impl_name = ''dotlrn_admin_profile_provider'');
-        else
-             v_group_id := p_group_id;
-        end if;
-
-        v_rel_id := dotlrn_full_user_profile_rel__new(
-            p_rel_id,
-            p_portal_id,
-            p_theme_id,
-            p_id,
-            p_rel_type,
-            v_group_id,
-            p_user_id,
-            p_creation_user,
-            p_creation_ip
-        );
-
-        insert
-        into dotlrn_full_admin_profile_rels
-        (rel_id)
-        values
-        (v_rel_id);
-
-        return v_rel_id;
-END;
-' language 'plpgsql';
-
-
-create function dotlrn_full_admin_profile_rel__delete(integer)
-returns integer as '
-DECLARE
-        p_rel_id                alias for $1;
-BEGIN
-        delete
-        from dotlrn_full_admin_profile_rels
-        where rel_id = p_rel_id;
-
-        PERFORM dotlrn_full_user_profile_rel__delete(p_rel_id);
-        return(0);
-END;
-' language 'plpgsql';