Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-create.sql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-create.sql	18 Feb 2003 20:54:32 -0000	1.6
+++ openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-create.sql	13 Mar 2003 20:23:24 -0000	1.7
@@ -200,19 +200,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;
 
@@ -241,22 +245,24 @@
   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';