Index: openacs-4/packages/acs-lang/acs-lang.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/acs-lang.info 29 Aug 2001 21:22:49 -0000 1.3 +++ openacs-4/packages/acs-lang/acs-lang.info 21 Oct 2001 18:16:34 -0000 1.4 @@ -4,6 +4,7 @@ OpenACS Localization Utils OpenACS Localization Utils + f t @@ -15,13 +16,13 @@ OpenACS Internationalization Utilities 2001-01-21 ArsDigita Corporation - OpenACS Internationalization Utilities. Routines for manipulating Locales, -request processor hooks, templating, message catalog, and -locale-specific formatting functions. - -This package contains a patch script which must be applied to ACS 4.1b installations. The patch script is in the -package/acs-lang/ACS4.1b-PATCHES directory -and must be run manually from a shell. See the README file + OpenACS Internationalization Utilities. Routines for manipulating Locales, +request processor hooks, templating, message catalog, and +locale-specific formatting functions. + +This package contains a patch script which must be applied to ACS 4.1b installations. The patch script is in the +package/acs-lang/ACS4.1b-PATCHES directory +and must be run manually from a shell. See the README file in that directory for details. @@ -33,6 +34,8 @@ + + @@ -47,22 +50,22 @@ + + - - - - - + + + + + - - - + + + - - - + @@ -71,26 +74,26 @@ + + - - + + - - + + - - + + - - Index: openacs-4/packages/acs-service-contract/acs-service-contract.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/acs-service-contract.info,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-service-contract/acs-service-contract.info 3 Oct 2001 03:23:59 -0000 1.2 +++ openacs-4/packages/acs-service-contract/acs-service-contract.info 21 Oct 2001 18:16:34 -0000 1.3 @@ -1,5 +1,5 @@ - + ACS Service Contract @@ -13,13 +13,27 @@ postgresql Neophytos Demetriou - Kapil Thangavelu + Kapil Thangavelu + + + + + + + + + + + + + + @@ -34,10 +48,13 @@ + + + Index: openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-drop.sql 19 Sep 2001 22:59:01 -0000 1.1 +++ openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-tables-drop.sql 21 Oct 2001 18:16:34 -0000 1.2 @@ -1,5 +1,5 @@ drop table acs_sc_bindings; -drop table acs_sc_impl_alias; +drop table acs_sc_impl_aliases; drop table acs_sc_impls; drop table acs_sc_operations; drop table acs_sc_contracts; Index: openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-views-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-views-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-views-create.sql 19 Sep 2001 22:59:01 -0000 1.1 +++ openacs-4/packages/acs-service-contract/sql/oracle/acs-sc-views-create.sql 21 Oct 2001 18:16:34 -0000 1.2 @@ -12,7 +12,7 @@ from acs_sc_operations o where o.contract_id = c.contract_id and not exists (select 1 - from acs_sc_impl_alias a + from acs_sc_impl_aliases a where a.impl_contract_name = c.contract_name and a.impl_id = i.impl_id and a.impl_operation_name = o.operation_name)); @@ -31,7 +31,7 @@ from acs_sc_operations o where o.contract_id = c.contract_id and not exists (select 1 - from acs_sc_impl_alias a + from acs_sc_impl_aliases a where a.impl_contract_name = c.contract_name and a.impl_id = i.impl_id and a.impl_operation_name = o.operation_name)); @@ -45,4 +45,4 @@ where b.impl_id = i.impl_id) and not exists (select 1 from acs_sc_contracts c - where c.contract_name = i.impl_contract_name); \ No newline at end of file + where c.contract_name = i.impl_contract_name); Index: openacs-4/packages/directory/directory.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/directory.info,v diff -u -r1.1 -r1.2 --- openacs-4/packages/directory/directory.info 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/directory/directory.info 21 Oct 2001 18:16:34 -0000 1.2 @@ -1,9 +1,10 @@ - + Directory Directories + f f @@ -25,7 +26,12 @@ + + + + + @@ -34,6 +40,7 @@ + Index: openacs-4/packages/directory/sql/postgresql/directory-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/sql/postgresql/directory-create.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/sql/postgresql/directory-create.sql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,33 @@ +-- +-- packages/directory/sql/directory-create.sql +-- +-- @author mikeb@arsdigita.com +-- @creation-date 2001-04-16 +-- @cvs-id $Id: directory-create.sql,v 1.1 2001/10/21 18:16:34 donb Exp $ +-- + +-- call this view using "and group_id = :application_group_id" +-- to find all members of an application_group +create view dir_group_members as + select p.party_id as user_id, p.email, pe.first_names, pe.last_name, p.url, r.object_id_one as group_id + from parties p, persons pe, acs_rels r + where p.party_id = pe.person_id + and p.party_id = r.object_id_two + and r.rel_type = 'membership_rel'; + +-- call this view using "and subsite_id = :subsite_id" +-- to find all members of a subsite +create view dir_subsite_members as + select m.*, g.package_id as subsite_id + from dir_group_members m, + application_groups g + where g.group_id = m.group_id; + +-- view to display all registered users +-- (the ACS registered_users view is slower, and retrieves a lot of information that we don't need) +create view dir_all_users as + select p.party_id as user_id, p.email, pe.first_names, pe.last_name, p.url + from parties p, persons pe + where p.party_id = pe.person_id; + + Index: openacs-4/packages/directory/sql/postgresql/directory-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/sql/postgresql/directory-drop.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/sql/postgresql/directory-drop.sql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,12 @@ +-- +-- packages/directory/sql/directory-create.sql +-- +-- @author mikeb@arsdigita.com +-- @creation-date 2001-04-16 +-- @cvs-id $Id: directory-drop.sql,v 1.1 2001/10/21 18:16:34 donb Exp $ +-- + +drop view dir_all_users; +drop view dir_subsite_members; +drop view dir_group_members; + Index: openacs-4/packages/directory/tcl/directory-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/Attic/directory-procs-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/tcl/directory-procs-oracle.xql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,38 @@ + + + + oracle8.1.6 + + + + + select * from ( + select object_id as subsite_id + from site_nodes n + where (select package_key from apm_packages p where p.package_id = n.object_id) = 'acs-subsite' + connect by node_id = prior parent_id + start with node_id = :node_id + order by level + ) where rownum = 1 + + + + + + + + + select * from ( + select object_id as subsite_id + from site_nodes n + where (select package_key from apm_packages p where p.package_id = n.object_id) = 'acs-subsite' + connect by node_id = prior parent_id + start with node_id = :node_id + order by level + ) where rownum = 1 + + + + + + Index: openacs-4/packages/directory/tcl/directory-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/Attic/directory-procs-postgresql.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/tcl/directory-procs-postgresql.xql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,21 @@ + + + + postgresql7.1 + + + + + select s2.object_id as subsite_id, tree_level(s2.tree_sortkey) as level + from site_nodes s1, site_nodes s2, apm_packages p + where s1.node_id = :node_id + and s2.tree_sortkey <= s1.tree_sortkey + and s1.tree_sortkey like (s2.tree_sortkey || '%') + and p.package_id = s2.object_id and p.package_key = 'acs-subsite' + order by level + limit 1 + + + + + Index: openacs-4/packages/directory/tcl/directory-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/directory-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/directory/tcl/directory-procs.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/directory/tcl/directory-procs.tcl 21 Oct 2001 18:16:34 -0000 1.2 @@ -52,11 +52,9 @@ the "excluded_vars" list. } { if {$all_users == "t"} { - set table_and_group " dir_all_users m - where 1=1" + set table_and_group [db_map table_and_group_1] } else { - set table_and_group " dir_group_members m - where group_id = :group_id" + set table_and_group [db_map table_and_group_2] set group_id [lindex [dir_app_group_info] 0] } Index: openacs-4/packages/directory/tcl/directory-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/tcl/directory-procs.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/tcl/directory-procs.xql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,56 @@ + + + + + + + select distinct upper(substr(last_name,1,1)) + from $table_and_group + + + + + + + + select node_id from site_nodes + where object_id = :package_id + + + + + + + + + select g.group_id, g.group_name + from groups g, application_groups a + where a.package_id = :subsite_id + and a.group_id = g.group_id + + + + + + + + + select node_id from site_nodes + where object_id = :package_id + + + + + + + dir_all_users m where 1=1 + + + + + + dir_group_members m where group_id = :group_id + + + + Index: openacs-4/packages/directory/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/www/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/directory/www/index.tcl 20 Apr 2001 20:51:10 -0000 1.1 +++ openacs-4/packages/directory/www/index.tcl 21 Oct 2001 18:16:34 -0000 1.2 @@ -45,14 +45,12 @@ # if they want to see all users, select from dir_all_users # and use a dummy where clause if {$all_users == "t"} { - set table_and_group " dir_all_users m -where 1=1" + set table_and_group [db_map table_and_group_1] set group_name "this site" set group_id -1 set page_title "Browse users" } else { - set table_and_group " dir_group_members m -where group_id = :group_id" + set table_and_group [db_map table_and_group_2] foreach {group_id group_name} [dir_app_group_info] {} set page_title "Browse members" } @@ -85,14 +83,14 @@ set alpha_nav_bar [dir_alpha_nav_bar -group_id $group_id -all_users $all_users $letter start_row] } -set total_users [db_string total_users " +set total_users [db_string total_users_1 " select count(1) from $table_and_group"] if {[empty_string_p $where_clause]} { set queried_users $total_users } else { - set queried_users [db_string total_users " + set queried_users [db_string total_users_1 " select count(1) from $table_and_group $where_clause"] Index: openacs-4/packages/directory/www/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/directory/www/index.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/directory/www/index.xql 21 Oct 2001 18:16:34 -0000 1.1 @@ -0,0 +1,33 @@ + + + + + + + select count(1) + from $table_and_group + + + + + + + + select count(1) + from $table_and_group + + + + + + dir_all_users m where 1=1 + + + + + + dir_group_members m where group_id = :group_id + + + +