Index: openacs-4/packages/dotlrn/tcl/class-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/class-procs.xql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/tcl/class-procs.xql 29 Mar 2002 19:38:25 -0000 1.11 +++ openacs-4/packages/dotlrn/tcl/class-procs.xql 1 May 2002 01:19:47 -0000 1.12 @@ -50,10 +50,12 @@ - - -select 1 from dotlrn_classes where dotlrn_classes.class_key = :class_key - - + + + select 1 + from dotlrn_classes + where dotlrn_classes.class_key = :class_key + + Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v diff -u -r1.16 -r1.17 --- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 18 Apr 2002 17:36:01 -0000 1.16 +++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql 1 May 2002 01:19:47 -0000 1.17 @@ -1,7 +1,7 @@ - oracle8.1.6 + oracle8.1.6 @@ -113,4 +113,5 @@ connect by object_type = prior supertype + Index: openacs-4/packages/dotlrn/tcl/community-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v diff -u -r1.53 -r1.54 --- openacs-4/packages/dotlrn/tcl/community-procs.xql 30 Apr 2002 21:23:30 -0000 1.53 +++ openacs-4/packages/dotlrn/tcl/community-procs.xql 1 May 2002 01:19:47 -0000 1.54 @@ -20,100 +20,111 @@ - - -declare -begin -end; - - + + + update dotlrn_community_types set portal_template_id= :template_id where community_type= :community_type + + - - -update dotlrn_community_types set portal_template_id= :template_id where community_type= :community_type - - + + + update dotlrn_community_types set package_id= :package_id where community_type= :community_type + + - - -update dotlrn_community_types set package_id= :package_id where community_type= :community_type - - + + + update dotlrn_communities set package_id= :package_id where community_id= :community_id + + - - -update dotlrn_communities set package_id= :package_id where community_id= :community_id - - + + + select dotlrn_communities.parent_community_id + from dotlrn_communities + where dotlrn_communities.community_id = :community_id + + - - -select dotlrn_communities.parent_community_id -from dotlrn_communities -where dotlrn_communities.community_id = :community_id - - + + + select 1 + from dotlrn_communities + where :parent_community_id in (select dc.parent_community_id + from dotlrn_communities dc + where dc.community_key = :community_key) + + - - -select 1 from dotlrn_communities where :parent_community_id in (select parent_community_id from dotlrn_communities where dotlrn_communities.community_key = :community_key) - - + + + select node_id + from site_nodes + where object_id = (select package_id + from dotlrn_community_types + where community_type = :community_type) + + - - -select node_id from site_nodes where object_id= (select package_id from dotlrn_community_types where community_type= :community_type) - - + + + select node_id + from site_nodes + where object_id = (select package_id + from dotlrn_communities + where community_id = :community_id) + + - - -select node_id from site_nodes where object_id= (select package_id from dotlrn_communities where community_id= :community_id) - - + + + update dotlrn_communities + set portal_template_id = :portal_template_id, + portal_id = :portal_id, + admin_portal_id= :admin_portal_id + where community_id = :community_id + + - - -update dotlrn_communities set portal_template_id = :portal_template_id, portal_id = :portal_id, admin_portal_id= :admin_portal_id where community_id = :community_id - - + + + select pretty_name + from acs_rel_roles + where role = :role + + - - - select pretty_name - from acs_rel_roles - where role = :role - - + + + select pretty_name + from acs_rel_roles + where role = (select role_two + from acs_rel_types + where rel_type = :rel_type) + + - - - select pretty_name - from acs_rel_roles - where role = (select role_two - from acs_rel_types - where rel_type = :rel_type) - - + + + select pretty_name + from acs_rel_roles + where role = (select acs_rel_types.role_two + from acs_rel_types, + acs_rels + where acs_rel_types.rel_type = acs_rels.rel_type + and acs_rels.rel_id = :rel_id) + + - - - select pretty_name - from acs_rel_roles - where role = (select acs_rel_types.role_two - from acs_rel_types, - acs_rels - where acs_rel_types.rel_type = acs_rels.rel_type - and acs_rels.rel_id = :rel_id) - - + + + select segment_id + from rel_segments + where group_id = :community_id + and rel_type= :rel_type + + - - -select segment_id from rel_segments where group_id= :community_id and rel_type= :rel_type - - - select dotlrn_member_rels_approved.rel_id, @@ -193,251 +204,295 @@ - - -select rel_id, portal_id from dotlrn_member_rels_full where community_id= :community_id and user_id= :user_id - - + + + select rel_id, + portal_id + from dotlrn_member_rels_full + where community_id = :community_id + and user_id= :user_id + + - - -select portal_id from dotlrn_member_rels_full where community_id= :community_id and user_id= :user_id - - + + + select portal_id + from dotlrn_member_rels_full + where community_id = :community_id + and user_id = :user_id + + - - -select portal_id from dotlrn_communities where community_id= :community_id - - + + + select portal_id + from dotlrn_communities + where community_id = :community_id + + - - -select admin_portal_id from dotlrn_communities where community_id= :community_id - - + + + select admin_portal_id + from dotlrn_communities + where community_id = :community_id + + - - - select dotlrn_communities_full.community_id, - dotlrn_communities_full.community_type, - dotlrn_communities_full.community_key, - dotlrn_communities_full.pretty_name, - dotlrn_communities_full.package_id, - dotlrn_communities_full.url - from dotlrn_communities_full, - dotlrn_member_rels_approved - where dotlrn_communities_full.community_id = dotlrn_member_rels_approved.community_id - and dotlrn_member_rels_approved.user_id = :user_id - - + + + select dotlrn_communities_full.* + from dotlrn_communities_full, + dotlrn_member_rels_approved + where dotlrn_communities_full.community_id = dotlrn_member_rels_approved.community_id + and dotlrn_member_rels_approved.user_id = :user_id + + - - -select dotlrn_communities.community_id as community_id, community_type, pretty_name, description, package_id -from dotlrn_communities, dotlrn_member_rels_full -where community_type= :community_type -and user_id= :user_id -and dotlrn_communities.community_id = dotlrn_member_rels_full.community_id - - + + + select dotlrn_communities.* + from dotlrn_communities, + dotlrn_member_rels_full + where dotlrn_communities.community_type = :community_type + and dotlrn_member_rels_full.user_id = :user_id + and dotlrn_communities.community_id = dotlrn_member_rels_full.community_id + + - - -select community_id, community_type, pretty_name, description, package_id, community_key -from dotlrn_communities -where community_type= :community_type - - + + + select dotlrn_communities.* + from dotlrn_communities + where community_type = :community_type + + - - -select community_type from dotlrn_community_types where package_id= :package_id - - + + + select community_type + from dotlrn_community_types + where package_id = :package_id + + - - -select community_type from dotlrn_communities where community_id=:community_id - - + + + select community_type + from dotlrn_communities + where community_id = :community_id + + - - -select 1 from dual where exists (select 1 from dotlrn_communities where parent_community_id = :community_id) - - + + + select 1 + from dual + where exists (select 1 + from dotlrn_communities + where parent_community_id = :community_id) + + - - -select community_id as subcomm_id from dotlrn_communities where parent_community_id = :community_id - - + + + select community_id as subcomm_id + from dotlrn_communities + where parent_community_id = :community_id + + - - - select - community_id, - community_key, - pretty_name, - url - from dotlrn_communities_full - where parent_community_id= :community_id - order by pretty_name - - + + + select community_id, + community_key, + pretty_name, + url + from dotlrn_communities_full + where parent_community_id = :community_id + order by pretty_name + + - - -select package_id from dotlrn_community_types where community_type= :community_type - - + + + select package_id + from dotlrn_community_types + where community_type = :community_type + + - - -select package_id from dotlrn_communities where community_id= :community_id - - + + + select package_id + from dotlrn_communities + where community_id = :community_id + + - - -select package_id -from dotlrn_community_applets dca, dotlrn_applets da -where community_id= :community_id -and applet_key= :applet_key -and dca.applet_id = da.applet_id - - + + + select package_id + from dotlrn_community_applets dca, + dotlrn_applets da + where community_id = :community_id + and applet_key = :applet_key + and dca.applet_id = da.applet_id + + - - -select pretty_name from dotlrn_community_types where community_type= :community_type - - + + + select pretty_name + from dotlrn_community_types + where community_type = :community_type + + - - -update dotlrn_communities set pretty_name = :pretty_name where community_id= :community_id - - + + + update dotlrn_communities + set pretty_name = :pretty_name + where community_id = :community_id + + - - -select pretty_name from dotlrn_communities where community_id= :community_id - - + + + select pretty_name + from dotlrn_communities + where community_id = :community_id + + - - -select description from dotlrn_communities where community_id= :community_id - - + + + select description + from dotlrn_communities + where community_id = :community_id + + - - -select community_key from dotlrn_communities where community_id= :community_id - - + + + select community_key + from dotlrn_communities + where community_id = :community_id + + - - -select 1 from dotlrn_active_comms_not_closed where community_id= :community_id - - + + + select 1 + from dotlrn_active_comms_not_closed + where community_id = :community_id + + - - -select 1 from dotlrn_active_comms_not_closed where community_id= :community_id and join_policy = 'open' - - + + + select 1 + from dotlrn_active_comms_not_closed + where community_id = :community_id + and join_policy = 'open' + + - - -select 1 from dotlrn_active_comms_not_closed where community_id= :community_id and join_policy = 'needs approval' - - + + + select 1 + from dotlrn_active_comms_not_closed + where community_id = :community_id + and join_policy = 'needs approval' + + - - -select portal_template_id from dotlrn_communities where community_id= :community_id - - + + + select portal_template_id + from dotlrn_communities + where community_id = :community_id + + - - -insert into dotlrn_community_applets -(community_id, applet_id, package_id, active_p) -values -(:community_id, :applet_id, :package_id, :active_p) - - + + + insert into dotlrn_community_applets + (community_id, applet_id, package_id, active_p) + values + (:community_id, :applet_id, :package_id, :active_p) + + - - -delete from dotlrn_community_applets -where community_id= :community_id and applet_id = :applet_id - - + + + delete from dotlrn_community_applets + where community_id = :community_id + and applet_id = :applet_id + + - - - select impl_name - from acs_sc_impls, acs_sc_bindings, acs_sc_contracts - where acs_sc_impls.impl_id = acs_sc_bindings.impl_id - and acs_sc_contracts.contract_id = acs_sc_bindings.contract_id - and acs_sc_contracts.contract_name = 'dotlrn_applet' - - + + + select impl_name + from acs_sc_impls, + acs_sc_bindings, + acs_sc_contracts + where acs_sc_impls.impl_id = acs_sc_bindings.impl_id + and acs_sc_contracts.contract_id = acs_sc_bindings.contract_id + and acs_sc_contracts.contract_name = 'dotlrn_applet' + + - - - select applet_key - from dotlrn_community_applets dca, - dotlrn_applets da - where community_id = :community_id - and dca.applet_id = da.applet_id - - + + + select applet_key + from dotlrn_community_applets dca, + dotlrn_applets da + where community_id = :community_id + and dca.applet_id = da.applet_id + + - - - select applet_key - from dotlrn_applets - where status = 'active' - - + + + select applet_key + from dotlrn_applets + where status = 'active' + + - - - select applet_key - from dotlrn_community_applets dca, - dotlrn_applets da - where community_id = :community_id - and active_p = 't' - and dca.applet_id = da.applet_id - and status = 'active' - - + + + select applet_key + from dotlrn_community_applets dca, + dotlrn_applets da + where community_id = :community_id + and active_p = 't' + and dca.applet_id = da.applet_id + and status = 'active' + + - - - select 1 - from dotlrn_community_applets dca, - dotlrn_applets da - where community_id = :community_id - and da.applet_key = :applet_key - and active_p = 't' - and dca.applet_id = da.applet_id - and status = 'active' - - + + + select 1 + from dotlrn_community_applets dca, + dotlrn_applets da + where community_id = :community_id + and da.applet_key = :applet_key + and active_p = 't' + and dca.applet_id = da.applet_id + and status = 'active' + + - - - select count(*) - from dotlrn_community_types - where supertype = :community_type - - + + + select count(*) + from dotlrn_community_types + where supertype = :community_type + + Index: openacs-4/packages/dotlrn/tcl/department-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/department-procs.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/department-procs.xql 29 Mar 2002 19:38:25 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/department-procs.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,27 +1,31 @@ - - - insert into dotlrn_departments - (department_key, external_url) - values - (:department_key, :external_url) - - - - - select 1 from dotlrn_departments where department_key = :department_key - - + + + insert into dotlrn_departments + (department_key, external_url) + values + (:department_key, :external_url) + + - - - select pretty_name, - department_key - from dotlrn_departments_full - order by pretty_name - - + + + select 1 + from dotlrn_departments + where department_key = :department_key + + + + + + select pretty_name, + department_key + from dotlrn_departments_full + order by pretty_name + + + Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/dotlrn-procs-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql 29 Mar 2002 19:38:25 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs-oracle.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,18 +1,26 @@ -oracle8.1.6 + oracle8.1.6 - - -begin acs_rel_type.create_role(role => :role, pretty_name => :pretty_name, pretty_plural => :pretty_plural); end; - - + + + begin acs_rel_type.create_role( + role => :role, + pretty_name => :pretty_name, + pretty_plural => :pretty_plural + ); end; + + - - -begin acs_rel_type.create_role(role => :role, pretty_name => :pretty_name, pretty_plural => :pretty_plural); end; - - + + + begin acs_rel_type.create_role( + role => :role, + pretty_name => :pretty_name, + pretty_plural => :pretty_plural + ); end; + + Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/dotlrn-procs-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql 29 Mar 2002 19:38:25 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/dotlrn-procs-postgresql.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,18 +1,26 @@ -postgresql7.1 + postgresql7.1 - - -select acs_rel_type__create_role(:role_key, :pretty_name, :pretty_plural) - - + + + select acs_rel_type__create_role( + :role_key, + :pretty_name, + :pretty_plural + ) + + - - -select acs_rel_type__create_role(:role_key, :pretty_name, :pretty_plural) - - + + + select acs_rel_type__create_role( + :role_key, + :pretty_name, + :pretty_plural + ) + + Index: openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/site-nodes-procs.xql,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql 18 Apr 2002 17:36:01 -0000 1.8 +++ openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql 1 May 2002 01:19:47 -0000 1.9 @@ -1,4 +1,5 @@ + Index: openacs-4/packages/dotlrn/tcl/term-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/term-procs-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/tcl/term-procs-oracle.xql 29 Mar 2002 19:38:25 -0000 1.4 +++ openacs-4/packages/dotlrn/tcl/term-procs-oracle.xql 1 May 2002 01:19:47 -0000 1.5 @@ -45,4 +45,5 @@ where dotlrn_terms.term_id = :term_id + Index: openacs-4/packages/dotlrn/tcl/term-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/term-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/tcl/term-procs.xql 29 Mar 2002 19:38:25 -0000 1.3 +++ openacs-4/packages/dotlrn/tcl/term-procs.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,28 +1,30 @@ - - - select dotlrn_terms.term_name - from dotlrn_terms - where dotlrn_terms.term_id = :term_id - - - - - select dotlrn_terms.term_year - from dotlrn_terms - where dotlrn_terms.term_id = :term_id - - + + + select dotlrn_terms.term_name + from dotlrn_terms + where dotlrn_terms.term_id = :term_id + + - - - select dotlrn_terms.term_name, - dotlrn_terms.term_year - from dotlrn_terms - where dotlrn_terms.term_id = :term_id - - + + + select dotlrn_terms.term_year + from dotlrn_terms + where dotlrn_terms.term_id = :term_id + + + + + + select dotlrn_terms.term_name, + dotlrn_terms.term_year + from dotlrn_terms + where dotlrn_terms.term_id = :term_id + + + Index: openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql 29 Mar 2002 19:38:26 -0000 1.9 +++ openacs-4/packages/dotlrn/www/communities-chunk-oracle.xql 1 May 2002 01:19:47 -0000 1.10 @@ -6,208 +6,225 @@ select count(*) - from dotlrn_communities_not_closed dotlrn_communities + from dotlrn_communities_not_closed - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 1 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_active_communities dotlrn_communities, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 1 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_active_communities dotlrn_communities, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 1 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_communities dotlrn_communities, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 1 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_communities dotlrn_communities, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 0 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_active_comms_not_closed dotlrn_communities - where not exists (select 1 - from dotlrn_member_rels_full - where dotlrn_member_rels_full.user_id = :user_id - and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 0 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_active_comms_not_closed dotlrn_communities + where not exists (select 1 + from dotlrn_member_rels_full + where dotlrn_member_rels_full.user_id = :user_id + and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 0 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_communities_not_closed dotlrn_communities - where not exists (select 1 - from dotlrn_member_rels_full - where dotlrn_member_rels_full.user_id = :user_id - and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) - and dotlrn_communities.parent_community_id is null - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 0 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_communities_not_closed dotlrn_communities + where not exists (select 1 + from dotlrn_member_rels_full + where dotlrn_member_rels_full.user_id = :user_id + and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) + and dotlrn_communities.parent_community_id is null + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select count(*) - from dotlrn_communities_not_closed dotlrn_communities - where dotlrn_communities.community_type = :community_type - - + + + select count(*) + from dotlrn_communities_not_closed dotlrn_communities + where dotlrn_communities.community_type = :community_type + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 1 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_active_communities dotlrn_communities, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id - and dotlrn_communities.community_type = :community_type - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 1 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_active_communities dotlrn_communities, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id + and dotlrn_communities.community_type = :community_type + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 1 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_communities dotlrn_communities, - dotlrn_member_rels_approved - where dotlrn_member_rels_approved.user_id = :user_id - and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id - and dotlrn_communities.community_type = :community_type - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 1 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_communities dotlrn_communities, + dotlrn_member_rels_approved + where dotlrn_member_rels_approved.user_id = :user_id + and dotlrn_member_rels_approved.community_id = dotlrn_communities.community_id + and dotlrn_communities.community_type = :community_type + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 0 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_active_comms_not_closed dotlrn_communities - where not exists (select 1 - from dotlrn_member_rels_full - where dotlrn_member_rels_full.user_id = :user_id - and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) - and dotlrn_communities.community_type = :community_type - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 0 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_active_comms_not_closed dotlrn_communities + where not exists (select 1 + from dotlrn_member_rels_full + where dotlrn_member_rels_full.user_id = :user_id + and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) + and dotlrn_communities.community_type = :community_type + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - 0 as member_p, - decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, - (select community_type - from dotlrn_community_types - where supertype = 'dotlrn_community' - start with community_type = dotlrn_communities.community_type - connect by community_type = prior supertype) as root_community_type - from dotlrn_communities_not_closed dotlrn_communities - where not exists (select 1 - from dotlrn_member_rels_full - where dotlrn_member_rels_full.user_id = :user_id - and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) - and dotlrn_communities.community_type = :community_type - order by root_community_type, dotlrn_communities.community_type, dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + 0 as member_p, + decode(acs_permission.permission_p(:user_id, dotlrn_communities.community_id, 'admin'),'f',0,1) as admin_p, + (select community_type + from dotlrn_community_types + where supertype = 'dotlrn_community' + start with community_type = dotlrn_communities.community_type + connect by community_type = prior supertype) as root_community_type + from dotlrn_communities_not_closed dotlrn_communities + where not exists (select 1 + from dotlrn_member_rels_full + where dotlrn_member_rels_full.user_id = :user_id + and dotlrn_member_rels_full.community_id = dotlrn_communities.community_id) + and dotlrn_communities.community_type = :community_type + order by root_community_type, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name + + + Index: openacs-4/packages/dotlrn/www/community-type.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-type.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/community-type.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/community-type.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,13 +1,15 @@ - - - select pretty_name, - description, - supertype - from dotlrn_community_types - where community_type = :community_type - - + + + + select pretty_name, + description, + supertype + from dotlrn_community_types + where community_type = :community_type + + + Index: openacs-4/packages/dotlrn/www/community-types-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-types-chunk-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/community-types-chunk-oracle.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/community-types-chunk-oracle.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,18 +1,19 @@ - oracle8.1.6 + oracle8.1.6 - - - select dotlrn_community_types.community_type, - dotlrn_community_types.pretty_name, - dotlrn_community_types.description, - (select site_node.url(site_nodes.node_id) - from site_nodes - where site_nodes.object_id = dotlrn_community_types.package_id) as url - from dotlrn_community_types - where dotlrn_community_types.supertype = :community_type - - + + + select dotlrn_community_types.community_type, + dotlrn_community_types.pretty_name, + dotlrn_community_types.description, + (select site_node.url(site_nodes.node_id) + from site_nodes + where site_nodes.object_id = dotlrn_community_types.package_id) as url + from dotlrn_community_types + where dotlrn_community_types.supertype = :community_type + + + Index: openacs-4/packages/dotlrn/www/community.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/community.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/community.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/community.xql 1 May 2002 01:19:47 -0000 1.4 @@ -2,10 +2,12 @@ - - -select pretty_name from dotlrn_communities where community_id = :community_id - - + + + select pretty_name + from dotlrn_communities + where community_id = :community_id + + Index: openacs-4/packages/dotlrn/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/index-oracle.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/index-oracle.xql 28 Apr 2002 04:08:42 -0000 1.7 +++ openacs-4/packages/dotlrn/www/index-oracle.xql 1 May 2002 01:19:47 -0000 1.8 @@ -1,7 +1,7 @@ -oracle8.1.6 + oracle8.1.6 Index: openacs-4/packages/dotlrn/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/index-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/index-postgresql.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/index-postgresql.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,12 +1,16 @@ -postgresql7.1 + postgresql7.1 - - -select class_key, node_id, site_node__url(node_id) as url from dotlrn_classes order by class_key - - + + + select class_key, + node_id, + site_node__url(node_id) as url + from dotlrn_classes + order by class_key + + Index: openacs-4/packages/dotlrn/www/join-policy-toggle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/join-policy-toggle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/join-policy-toggle.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/join-policy-toggle.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,11 +1,13 @@ - - - update groups - set join_policy = :policy - where group_id = :community_id - - + + + + update groups + set join_policy = :policy + where group_id = :community_id + + + Index: openacs-4/packages/dotlrn/www/my-communities-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/my-communities-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/my-communities-oracle.xql 12 Apr 2002 08:23:13 -0000 1.5 +++ openacs-4/packages/dotlrn/www/my-communities-oracle.xql 1 May 2002 01:19:47 -0000 1.6 @@ -3,21 +3,22 @@ oracle8.1.6 - - - select dotlrn_communities.community_id, - dotlrn_communities.community_type, - dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_communities.package_id, - dotlrn_community.url(dotlrn_communities.community_id) as url, - dotlrn_member_rels_approved.role, - decode(dotlrn_community.admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p - from dotlrn_communities, - dotlrn_member_rels_approved - where dotlrn_communities.community_id = dotlrn_member_rels_approved.community_id - and dotlrn_member_rels_approved.user_id = :user_id - order by dotlrn_communities.pretty_name - - + + + select dotlrn_communities.community_id, + dotlrn_communities.community_type, + dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_communities.package_id, + dotlrn_community.url(dotlrn_communities.community_id) as url, + dotlrn_member_rels_approved.role, + decode(dotlrn_community.admin_p(dotlrn_communities.community_id, dotlrn_member_rels_approved.user_id),'f',0,1) as admin_p + from dotlrn_communities, + dotlrn_member_rels_approved + where dotlrn_communities.community_id = dotlrn_member_rels_approved.community_id + and dotlrn_member_rels_approved.user_id = :user_id + order by dotlrn_communities.pretty_name + + + Index: openacs-4/packages/dotlrn/www/one-community-admin.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/one-community-admin.xql 29 Mar 2002 19:38:26 -0000 1.9 +++ openacs-4/packages/dotlrn/www/one-community-admin.xql 1 May 2002 01:19:47 -0000 1.10 @@ -1,15 +1,17 @@ - - - select community_type, - pretty_name, - description, - portal_template_id, - admin_portal_id - from dotlrn_communities - where community_id = :community_id - - + + + + select community_type, + pretty_name, + description, + portal_template_id, + admin_portal_id + from dotlrn_communities + where community_id = :community_id + + + Index: openacs-4/packages/dotlrn/www/one-community-type.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/one-community-type.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/one-community-type.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,13 +1,15 @@ - - - select pretty_name, - description, - supertype - from dotlrn_community_types - where community_type = :community_type - - + + + + select pretty_name, + description, + supertype + from dotlrn_community_types + where community_type = :community_type + + + Index: openacs-4/packages/dotlrn/www/one-community.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/one-community.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/one-community.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/one-community.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,11 +1,13 @@ - - - select pretty_name - from dotlrn_communities - where community_id = :community_id - - + + + + select pretty_name + from dotlrn_communities + where community_id = :community_id + + + Index: openacs-4/packages/dotlrn/www/spam.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/spam.xql 29 Mar 2002 19:38:26 -0000 1.5 +++ openacs-4/packages/dotlrn/www/spam.xql 1 May 2002 01:19:47 -0000 1.6 @@ -1,57 +1,58 @@ - - - select rel_segments.segment_id - from rel_segments - where rel_segments.group_id = :community_id - and rel_segments.rel_type = :rel_type - - - - - select parties.party_id - from party_approved_member_map, - parties - where party_approved_member_map.party_id = :segment_id - and party_approved_member_map.member_id <> :segment_id - and party_approved_member_map.member_id = parties.party_id - - + + + select rel_segments.segment_id + from rel_segments + where rel_segments.group_id = :community_id + and rel_segments.rel_type = :rel_type + + - - - select parties.email, - decode(acs_objects.object_type, - 'user', - (select first_names - from persons - where person_id = parties.party_id), - 'group', - (select group_name - from groups - where group_id = parties.party_id), - 'rel_segment', - (select segment_name - from rel_segments - where segment_id = parties.party_id), - '') as first_names, - decode(acs_objects.object_type, - 'user', - (select last_name - from persons - where person_id = parties.party_id), - '') as last_name - from party_approved_member_map, - parties, - acs_objects - where party_approved_member_map.party_id = :segment_id - and party_approved_member_map.member_id <> :segment_id - and party_approved_member_map.member_id = parties.party_id - and parties.party_id = acs_objects.object_id - - + + + select parties.party_id + from party_approved_member_map, + parties + where party_approved_member_map.party_id = :segment_id + and party_approved_member_map.member_id <> :segment_id + and party_approved_member_map.member_id = parties.party_id + + + + + select parties.email, + decode(acs_objects.object_type, + 'user', + (select first_names + from persons + where person_id = parties.party_id), + 'group', + (select group_name + from groups + where group_id = parties.party_id), + 'rel_segment', + (select segment_name + from rel_segments + where segment_id = parties.party_id), + '') as first_names, + decode(acs_objects.object_type, + 'user', + (select last_name + from persons + where person_id = parties.party_id), + '') as last_name + from party_approved_member_map, + parties, + acs_objects + where party_approved_member_map.party_id = :segment_id + and party_approved_member_map.member_id <> :segment_id + and party_approved_member_map.member_id = parties.party_id + and parties.party_id = acs_objects.object_id + + + Index: openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/add-instructor-2.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,15 +1,17 @@ - - - select user_id, - first_names, - last_name, - email - from registered_users - where lower(last_name) like lower('%' || :search_text || '%') - or lower(email) like lower('%' || :search_text || '%') - - + + + + select user_id, + first_names, + last_name, + email + from registered_users + where lower(last_name) like lower('%' || :search_text || '%') + or lower(email) like lower('%' || :search_text || '%') + + + Index: openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql 29 Mar 2002 19:38:26 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/add-instructor-3.xql 1 May 2002 01:19:47 -0000 1.4 @@ -1,13 +1,15 @@ - - - select count(*) - from dual - where exists (select 1 - from dotlrn_users - where user_id = :user_id) - - + + + + select count(*) + from dual + where exists (select 1 + from dotlrn_users + where user_id = :user_id) + + + Index: openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/class-instance-new-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/class-instance-new-oracle.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,7 +1,6 @@ - oracle8.1.6 Index: openacs-4/packages/dotlrn/www/admin/class.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/class.xql 29 Mar 2002 19:38:26 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/class.xql 1 May 2002 01:19:47 -0000 1.10 @@ -2,31 +2,31 @@ - - - select pretty_name, - description, - supertype - from dotlrn_classes_full - where class_key = :class_key - - + + + select pretty_name, + description, + supertype + from dotlrn_classes_full + where class_key = :class_key + + - - - select * - from dotlrn_class_instances_full dotlrn_class_instances - where dotlrn_class_instances.class_key = :class_key - - + + + select * + from dotlrn_class_instances_full dotlrn_class_instances + where dotlrn_class_instances.class_key = :class_key + + - - - select * - from dotlrn_class_instances_full dotlrn_class_instances - where dotlrn_class_instances.class_key = :class_key - and dotlrn_class_instances.term_id = :term_id - - + + + select * + from dotlrn_class_instances_full dotlrn_class_instances + where dotlrn_class_instances.class_key = :class_key + and dotlrn_class_instances.term_id = :term_id + + Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,6 +1,7 @@ + select dotlrn_classes_full.class_key, @@ -32,4 +33,5 @@ dotlrn_classes_full.pretty_name + Index: openacs-4/packages/dotlrn/www/admin/club-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/club-oracle.xql 29 Mar 2002 19:38:26 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/club-oracle.xql 1 May 2002 01:19:47 -0000 1.6 @@ -3,13 +3,14 @@ oracle8.1.6 - - - select dotlrn_communities.pretty_name, - dotlrn_communities.description, - dotlrn_community.url(:club_id) as url - from dotlrn_communities - where dotlrn_communities.community_id = :club_id - - + + + select dotlrn_communities.pretty_name, + dotlrn_communities.description, + dotlrn_community.url(:club_id) as url + from dotlrn_communities + where dotlrn_communities.community_id = :club_id + + + Index: openacs-4/packages/dotlrn/www/admin/department.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/department.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/department.xql 29 Mar 2002 19:38:26 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/department.xql 1 May 2002 01:19:47 -0000 1.6 @@ -1,13 +1,15 @@ - - - select pretty_name, - description, - external_url - from dotlrn_departments_full - where department_key = :department_key - - + + + + select pretty_name, + description, + external_url + from dotlrn_departments_full + where department_key = :department_key + + + Index: openacs-4/packages/dotlrn/www/admin/departments.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/departments.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/departments.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,13 +1,15 @@ - - - select department_key, - pretty_name - from dotlrn_departments_full - order by pretty_name, - department_key - - + + + + select department_key, + pretty_name + from dotlrn_departments_full + order by pretty_name, + department_key + + + Index: openacs-4/packages/dotlrn/www/admin/portal-templates.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/portal-templates.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/dotlrn/www/admin/portal-templates.xql 16 Apr 2002 13:53:52 -0000 1.1 +++ openacs-4/packages/dotlrn/www/admin/portal-templates.xql 1 May 2002 01:19:47 -0000 1.2 @@ -1,14 +1,18 @@ - - - select p.portal_id, name - from portals p, dotlrn_communities dc - where dc.portal_template_id = p.portal_id - and dc.portal_id is NULL - and dc.admin_portal_id is NULL - and dc.community_type != 'user_workspace' - - + + + + select p.portal_id, + name + from portals p, + dotlrn_communities dc + where dc.portal_template_id = p.portal_id + and dc.portal_id is null + and dc.admin_portal_id is null + and dc.community_type != 'user_workspace' + + + Index: openacs-4/packages/dotlrn/www/admin/terms.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/terms.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn/www/admin/terms.xql 29 Mar 2002 19:38:26 -0000 1.5 +++ openacs-4/packages/dotlrn/www/admin/terms.xql 1 May 2002 01:19:47 -0000 1.6 @@ -1,18 +1,20 @@ - - - select dotlrn_terms.term_id, - dotlrn_terms.term_name, - dotlrn_terms.term_year, - to_char(dotlrn_terms.start_date, 'Mon DD YYYY') as start_date, - to_char(dotlrn_terms.end_date, 'Mon DD YYYY') as end_date, - (select count(*) - from dotlrn_class_instances - where dotlrn_class_instances.term_id = dotlrn_terms.term_id) as n_classes - from dotlrn_terms - order by dotlrn_terms.start_date - - + + + + select dotlrn_terms.term_id, + dotlrn_terms.term_name, + dotlrn_terms.term_year, + to_char(dotlrn_terms.start_date, 'Mon DD YYYY') as start_date, + to_char(dotlrn_terms.end_date, 'Mon DD YYYY') as end_date, + (select count(*) + from dotlrn_class_instances + where dotlrn_class_instances.term_id = dotlrn_terms.term_id) as n_classes + from dotlrn_terms + order by dotlrn_terms.start_date + + + Index: openacs-4/packages/dotlrn/www/admin/user-new.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-new.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/admin/user-new.xql 29 Mar 2002 19:38:26 -0000 1.4 +++ openacs-4/packages/dotlrn/www/admin/user-new.xql 1 May 2002 01:19:47 -0000 1.5 @@ -1,17 +1,19 @@ - - - select user_id, - first_names, - last_name, - email - from registered_users - where lower(last_name) like lower('%' || :search_text || '%') - or lower(email) like lower('%' || :search_text || '%') - and user_id not in (select user_id - from dotlrn_users) - - + + + + select user_id, + first_names, + last_name, + email + from registered_users + where lower(last_name) like lower('%' || :search_text || '%') + or lower(email) like lower('%' || :search_text || '%') + and user_id not in (select user_id + from dotlrn_users) + + + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 28 Apr 2002 04:08:42 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-large-oracle.xql 1 May 2002 01:19:47 -0000 1.11 @@ -1,89 +1,89 @@ - oracle8.1.6 + oracle8.1.6 - - select dotlrn_users.user_id, - dotlrn_users.first_names, - dotlrn_users.last_name, - dotlrn_users.email, - dotlrn_users.access_level, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, - acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p - from dotlrn_users - where dotlrn_users.type = :type - and ( - lower(dotlrn_users.last_name) like lower('%' || :search_text || '%') - or lower(dotlrn_users.first_names) like lower('%' || :search_text || '%') - or lower(dotlrn_users.email) like lower('%' || :search_text || '%') - ) - order by dotlrn_users.last_name - + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + dotlrn_users.access_level, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + and ( + lower(dotlrn_users.last_name) like lower('%' || :search_text || '%') + or lower(dotlrn_users.first_names) like lower('%' || :search_text || '%') + or lower(dotlrn_users.email) like lower('%' || :search_text || '%') + ) + order by dotlrn_users.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'approved' - and not exists (select 1 - from acs_rels a, - dotlrn_user_types - where a.object_id_one = dotlrn_user_types.group_id - and a.object_id_two = acs_rels.object_id_two) - and ( - lower(persons.last_name) like lower('%' || :search_text || '%') - or lower(persons.first_names) like lower('%' || :search_text || '%') - or lower(parties.email) like lower('%' || :search_text || '%') - ) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'approved' + and not exists (select 1 + from acs_rels a, + dotlrn_user_types + where a.object_id_one = dotlrn_user_types.group_id + and a.object_id_two = acs_rels.object_id_two) + and ( + lower(persons.last_name) like lower('%' || :search_text || '%') + or lower(persons.first_names) like lower('%' || :search_text || '%') + or lower(parties.email) like lower('%' || :search_text || '%') + ) + order by persons.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - and ( - lower(persons.last_name) like lower('%' || :search_text || '%') - or lower(persons.first_names) like lower('%' || :search_text || '%') - or lower(parties.email) like lower('%' || :search_text || '%') - ) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' + and ( + lower(persons.last_name) like lower('%' || :search_text || '%') + or lower(persons.first_names) like lower('%' || :search_text || '%') + or lower(parties.email) like lower('%' || :search_text || '%') + ) + order by persons.last_name + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 28 Apr 2002 04:08:42 -0000 1.10 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-medium-oracle.xql 1 May 2002 01:19:47 -0000 1.11 @@ -4,14 +4,14 @@ oracle8.1.6 - - select count(*) - from dual - where exists (select 1 - from dotlrn_users - where dotlrn_users.type = :type - and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:dimension)) - + + select count(*) + from dual + where exists (select 1 + from dotlrn_users + where dotlrn_users.type = :type + and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:dimension)) + @@ -30,87 +30,87 @@ - - select count(*) - from persons, - acs_rels, - membership_rels - where acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.object_id_two = persons.person_id - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - and upper(substr(persons.last_name, 1, 1)) = upper(:section) - + + select count(*) + from persons, + acs_rels, + membership_rels + where acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.object_id_two = persons.person_id + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' + and upper(substr(persons.last_name, 1, 1)) = upper(:section) + - - select dotlrn_users.user_id, - dotlrn_users.first_names, - dotlrn_users.last_name, - dotlrn_users.email, - dotlrn_users.access_level, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, - acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p - from dotlrn_users - where dotlrn_users.type = :type - and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:section) - order by dotlrn_users.last_name - + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + dotlrn_users.access_level, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + and upper(substr(dotlrn_users.last_name, 1, 1)) = upper(:section) + order by dotlrn_users.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'approved' - and not exists (select 1 - from acs_rels a, - dotlrn_user_types - where a.object_id_one = dotlrn_user_types.group_id - and a.object_id_two = acs_rels.object_id_two) - and upper(substr(persons.last_name, 1, 1)) = upper(:section) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'approved' + and not exists (select 1 + from acs_rels a, + dotlrn_user_types + where a.object_id_one = dotlrn_user_types.group_id + and a.object_id_two = acs_rels.object_id_two) + and upper(substr(persons.last_name, 1, 1)) = upper(:section) + order by persons.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - and upper(substr(persons.last_name, 1, 1)) = upper(:section) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' + and upper(substr(persons.last_name, 1, 1)) = upper(:section) + order by persons.last_name + Index: openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 28 Apr 2002 04:08:42 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/users-chunk-small-oracle.xql 1 May 2002 01:19:47 -0000 1.12 @@ -4,71 +4,71 @@ oracle8.1.6 - - select dotlrn_users.user_id, - dotlrn_users.first_names, - dotlrn_users.last_name, - dotlrn_users.email, - dotlrn_users.access_level, - acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, - acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p - from dotlrn_users - where dotlrn_users.type = :type - order by dotlrn_users.last_name - + + select dotlrn_users.user_id, + dotlrn_users.first_names, + dotlrn_users.last_name, + dotlrn_users.email, + dotlrn_users.access_level, + acs_permission.permission_p(:dotlrn_package_id, dotlrn_users.user_id, 'read_private_data') as read_private_data_p, + acs_permission.permission_p(:root_object_id, dotlrn_users.user_id, 'admin') as site_wide_admin_p + from dotlrn_users + where dotlrn_users.type = :type + order by dotlrn_users.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'approved' - and not exists (select 1 - from acs_rels a, - dotlrn_user_types - where a.object_id_one = dotlrn_user_types.group_id - and a.object_id_two = acs_rels.object_id_two) - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'approved' + and not exists (select 1 + from acs_rels a, + dotlrn_user_types + where a.object_id_one = dotlrn_user_types.group_id + and a.object_id_two = acs_rels.object_id_two) + order by persons.last_name + - - select users.user_id, - persons.first_names, - persons.last_name, - parties.email, - 'limited' as access_level, - 'f' as read_private_data_p, - acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p - from parties, - users, - persons, - acs_rels, - membership_rels - where parties.party_id = users.user_id - and users.user_id = persons.person_id - and persons.person_id = acs_rels.object_id_two - and acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - order by persons.last_name - + + select users.user_id, + persons.first_names, + persons.last_name, + parties.email, + 'limited' as access_level, + 'f' as read_private_data_p, + acs_permission.permission_p(:root_object_id, users.user_id, 'admin') as site_wide_admin_p + from parties, + users, + persons, + acs_rels, + membership_rels + where parties.party_id = users.user_id + and users.user_id = persons.person_id + and persons.person_id = acs_rels.object_id_two + and acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' + order by persons.last_name + Index: openacs-4/packages/dotlrn/www/admin/users-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/Attic/users-oracle.xql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/admin/users-oracle.xql 7 Apr 2002 01:16:52 -0000 1.9 +++ openacs-4/packages/dotlrn/www/admin/users-oracle.xql 1 May 2002 01:19:47 -0000 1.10 @@ -24,16 +24,16 @@ - - select count(*) - from persons, - acs_rels, - membership_rels - where acs_rels.object_id_one = acs.magic_object_id('registered_users') - and acs_rels.object_id_two = persons.person_id - and acs_rels.rel_id = membership_rels.rel_id - and membership_rels.member_state = 'banned' - + + select count(*) + from persons, + acs_rels, + membership_rels + where acs_rels.object_id_one = acs.magic_object_id('registered_users') + and acs_rels.object_id_two = persons.person_id + and acs_rels.rel_id = membership_rels.rel_id + and membership_rels.member_state = 'banned' +