Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/Attic/upgrade-4.6-4.6.1.sql,v
diff -u -N -r1.1.2.5 -r1.1.2.6
--- openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql	16 Feb 2003 02:17:34 -0000	1.1.2.5
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.6-4.6.1.sql	26 Feb 2003 02:24:03 -0000	1.1.2.6
@@ -215,6 +215,10 @@
 set object_id = -4
 where object_id = 0;
 
+update acs_objects
+set context_id = -4
+where context_id = 0;
+
 -- Content Repository sets parent_id to security_context_root
 -- for content modules
 
@@ -386,19 +390,23 @@
   p_member_id alias for $2;
   p_rel_id alias for $3;
   p_rel_type alias for $4;
-  v_segment_id rel_segments.segment_id%TYPE;
+  v_segments record;
 begin
 
   perform party_approved_member__add_one(p_party_id, p_member_id, p_rel_id);
 
-  select into v_segment_id segment_id
-  from rel_segments s
-  where s.rel_type = p_rel_type
-    and s.group_id = p_party_id;
+  -- if the relation type is mapped to relational segments unmap them too
 
-  if found then
-    perform party_approved_member__add_one(v_segment_id, p_member_id, p_rel_id);
-  end if;
+  for v_segments in select segment_id
+                  from rel_segments s, acs_object_types o1, acs_object_types o2
+                  where 
+                    o1.object_type = p_rel_type
+                    and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey)
+                    and s.rel_type = o2.object_type
+                    and s.group_id = p_party_id
+  loop
+    perform party_approved_member__add_one(v_segments.segment_id, p_member_id, p_rel_id);
+  end loop;
 
   return 1;
 
@@ -420,34 +428,34 @@
 
 end;' language 'plpgsql';
 
-
 create or replace function party_approved_member__remove(integer, integer, integer, varchar) returns integer as '
 declare
   p_party_id alias for $1;
   p_member_id alias for $2;
   p_rel_id alias for $3;
   p_rel_type alias for $4;
-  v_segment_id rel_segments.segment_id%TYPE;
+  v_segments record;
 begin
 
   perform party_approved_member__remove_one(p_party_id, p_member_id, p_rel_id);
 
-  -- if the relation type is mapped to a relational segment unmap that too
+  -- if the relation type is mapped to relational segments unmap them too
 
-  select into v_segment_id segment_id
-  from rel_segments s
-  where s.rel_type = p_rel_type
-    and s.group_id = p_party_id;
+  for v_segments in select segment_id
+                  from rel_segments s, acs_object_types o1, acs_object_types o2
+                  where 
+                    o1.object_type = p_rel_type
+                    and o1.tree_sortkey between o2.tree_sortkey and tree_right(o2.tree_sortkey)
+                    and s.rel_type = o2.object_type
+                    and s.group_id = p_party_id
+  loop
+    perform party_approved_member__remove_one(v_segments.segment_id, p_member_id, p_rel_id);
+  end loop;
 
-  if found then
-    perform party_approved_member__remove_one(v_segment_id, p_member_id, p_rel_id);
-  end if;
-
   return 1;
 
 end;' language 'plpgsql';
 
-
 -- Triggers to maintain party_approved_member_map when parties are created or
 -- destroyed.