Index: openacs-4/packages/acs-kernel/acs-kernel.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v
diff -u -r1.80 -r1.80.2.1
--- openacs-4/packages/acs-kernel/acs-kernel.info 21 Mar 2005 22:05:04 -0000 1.80
+++ openacs-4/packages/acs-kernel/acs-kernel.info 24 May 2005 02:21:02 -0000 1.80.2.1
@@ -7,7 +7,7 @@
<initial-install-p>t</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="5.2.0d9" url="http://openacs.org/repository/download/apm/acs-kernel-5.2.0d9.apm">
+ <version name="5.2.0d10" url="http://openacs.org/repository/download/apm/acs-kernel-5.2.0d10.apm">
<owner url="mailto:oct@openacs.org">OpenACS Core Team</owner>
<summary>Routines and data models providing the foundation for OpenACS-based Web services.</summary>
<release-date>2005-01-09</release-date>
@@ -16,7 +16,7 @@
<license>GPL</license>
<maturity>3</maturity>
- <provides url="acs-kernel" version="5.2.0d9"/>
+ <provides url="acs-kernel" version="5.2.0d10"/>
<callbacks>
</callbacks>
Index: openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql 12 Jul 2004 14:49:48 -0000 1.14
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-body-create.sql 24 May 2005 02:21:02 -0000 1.14.2.1
@@ -503,9 +503,6 @@
/
show errors
-
-
-
create or replace package body membership_rel
as
@@ -559,6 +556,16 @@
where rel_id = approve.rel_id;
end;
+ procedure merge (
+ rel_id in membership_rels.rel_id%TYPE
+ )
+ is
+ begin
+ update membership_rels
+ set member_state = 'merged'
+ where rel_id = approve.rel_id;
+ end;
+
procedure reject (
rel_id in membership_rels.rel_id%TYPE
)
Index: openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 27 Feb 2005 01:21:07 -0000 1.9
+++ openacs-4/packages/acs-kernel/sql/oracle/groups-create.sql 24 May 2005 02:21:02 -0000 1.9.2.1
@@ -30,7 +30,7 @@
primary key,
member_state varchar2(20) not null
constraint membership_rel_mem_ck
- check (member_state in ('approved', 'needs approval',
+ check (member_state in ('merged','approved', 'needs approval',
'banned', 'rejected', 'deleted'))
);
@@ -452,6 +452,10 @@
rel_id in membership_rels.rel_id%TYPE
);
+ procedure merge (
+ rel_id in membership_rels.rel_id%TYPE
+ );
+
procedure reject (
rel_id in membership_rels.rel_id%TYPE
);
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.2.0d9-5.2.0d10.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 12 Jul 2004 14:49:48 -0000 1.29
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 24 May 2005 02:21:02 -0000 1.29.2.1
@@ -701,7 +701,19 @@
return 0;
end;' language 'plpgsql';
+-- procedure merge
+create or replace function membership_rel__merge (integer)
+returns integer as '
+declare
+ merge__rel_id alias for $1;
+begin
+ update membership_rels
+ set member_state = ''merged''
+ where rel_id = merge__rel_id;
+ return 0;
+end;' language 'plpgsql';
+
-- function check_index
create or replace function membership_rel__check_index (integer,integer,integer)
returns boolean as '
Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v
diff -u -r1.19 -r1.19.2.1
--- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 27 Feb 2005 01:21:07 -0000 1.19
+++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 24 May 2005 02:21:02 -0000 1.19.2.1
@@ -32,7 +32,7 @@
primary key,
-- null means waiting for admin approval
member_state varchar(20) constraint membership_rel_mem_ck
- check (member_state in ('approved', 'needs approval',
+ check (member_state in ('merged','approved', 'needs approval',
'banned', 'rejected', 'deleted'))
);
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.2.0d9-5.2.0d10.sql'.
Fisheye: No comparison available. Pass `N' to diff?