Index: openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql 7 Aug 2017 23:47:58 -0000 1.5
+++ openacs-4/packages/acs-subsite/tcl/relation-procs-oracle.xql 22 Nov 2017 14:38:20 -0000 1.6
@@ -10,55 +10,13 @@
-
-
-
-
- select s.segment_id, r.object_id_two as party_id, t.package_name
- from rel_segments s, acs_rels r, acs_object_types t
- where r.object_id_one = s.group_id(+)
- and r.rel_type = s.rel_type(+)
- and r.rel_type = t.object_type
- and r.rel_id = :rel_id
-
-
-
-
-
begin ${package_name}.del(:rel_id); end;
-
-
-
-
- select case when exists
- (select 1 from rc_violations_by_removing_rel r where r.rel_id = :rel_id)
- then 1 else 0 end
- from dual
-
-
-
-
-
-
-
-
- select case when exists
- (select 1 from rc_valid_rel_types r
- where r.group_id = :group_id
- and r.rel_type = :rel_type)
- then 1 else 0 end
- from dual
-
-
-
-
-
@@ -90,34 +48,4 @@
-
-
-
-
- select distinct s.segment_id, s.group_id, s.rel_type,
- g.group_name, g.join_policy, t.pretty_name as rel_type_pretty_name,
- nvl(dl.dependency_level, 0)
- from rc_all_constraints c,
- (select rel_segment, required_rel_segment
- from rc_segment_required_seg_map
- where rel_side = 'two'
- UNION ALL
- select segment_id, segment_id
- from rel_segments) map,
- rel_segments s,
- rc_segment_dependency_levels dl,
- groups g, acs_object_types t
- where c.group_id = :group_id
- and c.rel_type = :rel_type
- and c.required_rel_segment = map.rel_segment
- and map.required_rel_segment = s.segment_id
- and s.segment_id = dl.segment_id(+)
- and g.group_id = s.group_id
- and t.object_type = s.rel_type
- order by nvl(dl.dependency_level, 0)
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/tcl/relation-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs-postgresql.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/tcl/relation-procs-postgresql.xql 7 Aug 2017 23:47:58 -0000 1.7
+++ openacs-4/packages/acs-subsite/tcl/relation-procs-postgresql.xql 22 Nov 2017 14:38:20 -0000 1.8
@@ -8,35 +8,13 @@
select rel_constraint__violation(:rel_id)
-
select ${package_name}__delete(:rel_id) from dual
-
-
-
- select case when exists
- (select 1 from rc_violations_by_removing_rel r where r.rel_id = :rel_id)
- then 1 else 0 end
-
-
-
-
-
-
- select case when exists
- (select 1 from rc_valid_rel_types r
- where r.group_id = :group_id
- and r.rel_type = :rel_type)
- then 1 else 0 end
-
-
-
-
select
@@ -65,6 +43,5 @@
-
Index: openacs-4/packages/acs-subsite/tcl/relation-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/tcl/relation-procs.xql,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/tcl/relation-procs.xql 7 Aug 2017 23:47:58 -0000 1.6
+++ openacs-4/packages/acs-subsite/tcl/relation-procs.xql 22 Nov 2017 14:38:20 -0000 1.7
@@ -87,4 +87,28 @@
+
+
+
+ select case when exists
+ (select 1 from rc_violations_by_removing_rel r where r.rel_id = :rel_id)
+ then 1 else 0 end
+ from dual
+
+
+
+
+
+
+
+ select case when exists
+ (select 1 from rc_valid_rel_types r
+ where r.group_id = :group_id
+ and r.rel_type = :rel_type)
+ then 1 else 0 end
+ from dual
+
+
+
+