Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.141.2.8 -r1.141.2.9 --- openacs-4/packages/dotlrn/dotlrn.info 12 Jun 2016 17:34:52 -0000 1.141.2.8 +++ openacs-4/packages/dotlrn/dotlrn.info 3 Aug 2016 10:08:23 -0000 1.141.2.9 @@ -7,15 +7,15 @@ f f - + OpenACS A Course Management System 2015-10-04 DotLRN Consortium 2 Course Management - + Index: openacs-4/packages/dotlrn/sql/postgresql/communities-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/communities-package-create.sql,v diff -u -r1.11.4.1 -r1.11.4.2 --- openacs-4/packages/dotlrn/sql/postgresql/communities-package-create.sql 12 Jun 2016 17:34:52 -0000 1.11.4.1 +++ openacs-4/packages/dotlrn/sql/postgresql/communities-package-create.sql 3 Aug 2016 10:08:23 -0000 1.11.4.2 @@ -331,13 +331,9 @@ p_party_id integer ) RETURNS boolean AS $$ DECLARE - v_member_p char(1); + v_member_p boolean; BEGIN - select CASE - WHEN count(*) = 0 - THEN 'f' - ELSE 't' - END + select (count(*) = 0) into v_member_p from dual where exists (select 1 @@ -348,7 +344,6 @@ return v_member_p; END; - $$ LANGUAGE plpgsql; @@ -364,21 +359,20 @@ p_party_id integer ) RETURNS boolean AS $$ DECLARE - r_rv char(1); + r_rv boolean; BEGIN -- THIS NEEDS TO BE CHECKED! -- chak, 2002-07-01 select CASE - WHEN acs_permission__permission_p(p_community_id, p_party_id, 'dotlrn_admin_community') = 'f' + WHEN acs_permission__permission_p(p_community_id, p_party_id, 'dotlrn_admin_community') is false THEN acs_permission__permission_p(p_community_id,p_party_id,'admin') - ELSE 't' + ELSE true END into r_rv from dual; return r_rv; END; - $$ LANGUAGE plpgsql; @@ -421,22 +415,17 @@ -- CREATE OR REPLACE FUNCTION dotlrn_community__has_subcomm_p( p_community_id integer -) RETURNS varchar AS $$ +) RETURNS boolean AS $$ DECLARE - r_rv char(1); + r_rv boolean; BEGIN - select CASE - WHEN count(*) = 0 - THEN 'f' - ELSE 't' - END + select (count(*) = 0) into r_rv - from dual + from dotlrn_communities_all where dotlrn_communities_all.community_id = p_community_id; return r_rv; END; - $$ LANGUAGE plpgsql; create view dotlrn_communities_full Index: openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql 1 Nov 2013 21:08:29 -0000 1.3 +++ openacs-4/packages/dotlrn/sql/postgresql/privacy-init.sql 3 Aug 2016 10:08:23 -0000 1.3.4.1 @@ -97,7 +97,7 @@ create or replace view dotlrn_guest_status as select r.object_id_two as user_id, - case when r.rel_type = 'dotlrn_guest_rel' then 't' else 'f' end as guest_p + case when r.rel_type = 'dotlrn_guest_rel' then true else false end as guest_p from acs_rels r, membership_rels m where m.rel_id = r.rel_id Index: openacs-4/packages/dotlrn/sql/postgresql/privacy-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/sql/postgresql/privacy-package-create.sql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/dotlrn/sql/postgresql/privacy-package-create.sql 1 Nov 2013 21:08:29 -0000 1.3 +++ openacs-4/packages/dotlrn/sql/postgresql/privacy-package-create.sql 3 Aug 2016 10:08:23 -0000 1.3.4.1 @@ -16,10 +16,10 @@ -- CREATE OR REPLACE FUNCTION dotlrn_privacy__guest_p( p_user_id integer -) RETURNS char AS $$ +) RETURNS boolean AS $$ DECLARE v_count integer; - v_guest_p char(1); + v_guest_p boolean; BEGIN select count(*) into v_count from dotlrn_guest_status where user_id = p_user_id; if v_count > 1 then Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/sql/postgresql/upgrade/upgrade-2.9.1d3-2.9.1d4.sql'. Fisheye: No comparison available. Pass `N' to diff?