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 @@
<package key="acs-lang" url="http://www.openacs.org/acs-repository/apm/packages/acs-lang" type="apm_service">
<package-name>OpenACS Localization Utils</package-name>
<pretty-plural>OpenACS Localization Utils</pretty-plural>
+ <initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
<version name="4.1b" url="http://www.openacs.org/acs-repository/download/apm/acs-lang-4.1b.apm">
@@ -15,13 +16,13 @@
<summary>OpenACS Internationalization Utilities</summary>
<release-date>2001-01-21</release-date>
<vendor url="http://www.arsdigita.com/">ArsDigita Corporation</vendor>
- <description format="text/html">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
+ <description format="text/html">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.</description>
<requires url="acs-kernel" version="4.1"/>
@@ -33,6 +34,8 @@
<file path="ACS4.1b-PATCHES/tag-init.patch"/>
<file path="ACS4.1b-PATCHES/util-procs.patch"/>
<file type="package_spec" path="acs-lang.info"/>
+ <file path="acs-lang.info.orig"/>
+ <file path="acs-lang.info.rej"/>
<file path="catalog/test.iso-8859-1.cat"/>
<file type="data_model_create" db_type="oracle" path="sql/oracle/acs-lang-create.sql"/>
<file type="data_model" db_type="oracle" path="sql/oracle/ad-locales-drop.sql"/>
@@ -47,22 +50,22 @@
<file type="data_model" db_type="postgresql" path="sql/postgresql/message-catalog-drop.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/message-catalog.sql"/>
<file type="tcl_procs" path="tcl/acs-lang-procs.tcl"/>
+ <file type="query_file" db_type="oracle" path="tcl/lang-init-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="tcl/lang-init-postgresql.xql"/>
<file type="tcl_init" path="tcl/lang-init.tcl"/>
- <file type="query_file" db_type="postgresql" path="tcl/lang-init-postgresql.xql"/>
- <file type="query_file" db_type="oracle" path="tcl/lang-init-oracle.xql"/>
- <file type="tcl_procs" path="tcl/lang-procs.tcl"/>
- <file type="query_file" db_type="oracle" path="tcl/lang-procs-oracle.xql"/>
- <file type="query_file" path="tcl/lang-procs.xql"/>
+ <file type="query_file" db_type="oracle" path="tcl/lang-procs-oracle.xql"/>
+ <file type="tcl_procs" path="tcl/lang-procs.tcl"/>
+ <file type="query_file" path="tcl/lang-procs.xql"/>
<file type="tcl_init" path="tcl/locale-init.tcl"/>
+ <file type="query_file" db_type="oracle" path="tcl/locale-procs-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="tcl/locale-procs-postgresql.xql"/>
<file type="tcl_procs" path="tcl/locale-procs.tcl"/>
- <file type="query_file" db_type="oracle" path="tcl/locale-procs-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="tcl/locale-procs-postgresql.xql"/>
- <file type="query_file" path="tcl/locale-procs.xql"/>
+ <file type="query_file" path="tcl/locale-procs.xql"/>
<file type="tcl_init" path="tcl/localization-data-init.tcl"/>
+ <file type="query_file" db_type="oracle" path="tcl/localization-procs-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="tcl/localization-procs-postgresql.xql"/>
<file type="tcl_procs" path="tcl/localization-procs.tcl"/>
- <file type="query_file" db_type="oracle" path="tcl/localization-procs-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="tcl/localization-procs-postgresql.xql"/>
- <file type="query_file" path="tcl/localization-procs.xql"/>
+ <file type="query_file" path="tcl/localization-procs.xql"/>
<file type="content_page" path="www/catalog-test.adp"/>
<file type="content_page" path="www/catalog-test.tcl"/>
<file type="content_page" path="www/compile.tcl"/>
@@ -71,26 +74,26 @@
<file type="documentation" path="www/doc/i18n-design.html"/>
<file type="documentation" path="www/doc/i18n-requirements.html"/>
<file type="documentation" path="www/doc/questions"/>
+ <file type="query_file" db_type="oracle" path="www/format-test-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/format-test-postgresql.xql"/>
<file type="content_page" path="www/format-test.adp"/>
<file type="content_page" path="www/format-test.tcl"/>
- <file type="query_file" db_type="oracle" path="www/format-test-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="www/format-test-postgresql.xql"/>
<file type="content_page" path="www/index.html"/>
<file type="content_page" path="www/locale-set.tcl"/>
+ <file type="query_file" db_type="oracle" path="www/set-system-timezone-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/set-system-timezone-postgresql.xql"/>
<file type="content_page" path="www/set-system-timezone.tcl"/>
- <file type="query_file" db_type="oracle" path="www/set-system-timezone-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="www/set-system-timezone-postgresql.xql"/>
<file type="content_page" path="www/show-catalog.adp"/>
<file type="content_page" path="www/show-catalog.tcl"/>
<file type="content_page" path="www/show.tcl"/>
+ <file type="query_file" db_type="oracle" path="www/test-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/test-postgresql.xql"/>
<file type="content_page" path="www/test.adp"/>
<file type="content_page" path="www/test.tcl"/>
- <file type="query_file" db_type="oracle" path="www/test-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="www/test-postgresql.xql"/>
+ <file type="query_file" db_type="oracle" path="www/timezone-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="www/timezone-postgresql.xql"/>
<file type="content_page" path="www/timezone.adp"/>
<file type="content_page" path="www/timezone.tcl"/>
- <file type="query_file" db_type="oracle" path="www/timezone-oracle.xql"/>
- <file type="query_file" db_type="postgresql" path="www/timezone-postgresql.xql"/>
<file type="content_page" path="www/tz-test.tcl"/>
</files>
<parameters>
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 @@
<?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
<package key="acs-service-contract" url="http://www.arsdigita.com/acs-repository/apm/packages/acs-service-contract" type="apm_service">
<package-name>ACS Service Contract</package-name>
@@ -13,13 +13,27 @@
<database>postgresql</database>
</database-support>
<owner url="mailto:k2pts@yahoo.com">Neophytos Demetriou</owner>
- <owner url="mailto:k_vertigo@yahoo.com">Kapil Thangavelu</owner>
+ <owner url="mailto:k_vertigo@yahoo.com">Kapil Thangavelu</owner>
<!-- No dependency information -->
<files>
<file type="package_spec" path="acs-service-contract.info"/>
<file path="acs-service-contract.info~"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-msg-types-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-msg-types-drop.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-object-types-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-object-types-drop.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-packages-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-packages-drop.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-tables-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-tables-drop.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-views-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/acs-sc-views-drop.sql"/>
+ <file type="data_model_create" db_type="oracle" path="sql/oracle/acs-service-contract-create.sql"/>
+ <file type="data_model_drop" db_type="oracle" path="sql/oracle/acs-service-contract-drop.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/sc-sample-create.sql"/>
+ <file type="data_model" db_type="oracle" path="sql/oracle/sc-sample-drop.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/acs-sc-msg-types-create.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/acs-sc-msg-types-drop.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/acs-sc-object-types-create.sql"/>
@@ -34,10 +48,13 @@
<file type="data_model_drop" db_type="postgresql" path="sql/postgresql/acs-service-contract-drop.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/sc-sample-create.sql"/>
<file type="data_model" db_type="postgresql" path="sql/postgresql/sc-sample-drop.sql"/>
+ <file type="query_file" db_type="oracle" path="tcl/acs-service-contract-init-oracle.xql"/>
<file type="tcl_init" path="tcl/acs-service-contract-init.tcl"/>
+ <file type="query_file" db_type="oracle" path="tcl/acs-service-contract-procs-oracle.xql"/>
<file type="tcl_procs" path="tcl/acs-service-contract-procs.tcl"/>
<file type="tcl_util" path="www/binding-install.tcl"/>
<file type="tcl_util" path="www/binding-uninstall.tcl"/>
+ <file type="documentation" path="www/doc/index.html"/>
<file type="documentation" path="www/doc/notes.html"/>
<file path="www/index.adp"/>
<file type="tcl_util" path="www/index.tcl"/>
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 @@
<?xml version="1.0"?>
-<!-- Generated by the ACS Package Manager -->
+<!-- Generated by the OpenACS Package Manager -->
<package key="directory" url="http://www.arsdigita.com/acs-repository/apm/packages/directory" type="apm_application">
<package-name>Directory</package-name>
<pretty-plural>Directories</pretty-plural>
+ <initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
<version name="4.2a" url="http://www.arsdigita.com/acs-repository/download/apm/directory-4.2a.apm">
@@ -25,7 +26,12 @@
<file type="package_spec" path="directory.info"/>
<file type="data_model_create" db_type="oracle" path="sql/oracle/directory-create.sql"/>
<file type="data_model_drop" db_type="oracle" path="sql/oracle/directory-drop.sql"/>
+ <file type="data_model_create" db_type="postgresql" path="sql/postgresql/directory-create.sql"/>
+ <file type="data_model_drop" db_type="postgresql" path="sql/postgresql/directory-drop.sql"/>
+ <file type="query_file" db_type="oracle" path="tcl/directory-procs-oracle.xql"/>
+ <file type="query_file" db_type="postgresql" path="tcl/directory-procs-postgresql.xql"/>
<file type="tcl_procs" path="tcl/directory-procs.tcl"/>
+ <file type="query_file" path="tcl/directory-procs.xql"/>
<file type="template" path="templates/master.adp"/>
<file type="template" path="templates/master.tcl"/>
<file type="documentation" path="www/doc/ad.css"/>
@@ -34,6 +40,7 @@
<file type="documentation" path="www/doc/xml/index.xml"/>
<file type="content_page" path="www/index.adp"/>
<file type="content_page" path="www/index.tcl"/>
+ <file type="query_file" path="www/index.xql"/>
</files>
<parameters>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="PageWidth" default="600" description="the default page width"/>
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 @@
+<?xml version="1.0"?>
+
+<queryset>
+ <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
+
+<fullquery name="dir_app_group_info.subsite_p">
+ <querytext>
+
+ 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
+
+ </querytext>
+</fullquery>
+
+
+<fullquery name="dir_app_group_info.subsite_p">
+ <querytext>
+
+ 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
+
+ </querytext>
+</fullquery>
+
+
+</queryset>
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 @@
+<?xml version="1.0"?>
+
+<queryset>
+ <rdbms><type>postgresql</type><version>7.1</version></rdbms>
+
+<fullquery name="dir_app_group_info.subsite_p">
+ <querytext>
+
+ 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
+
+ </querytext>
+</fullquery>
+
+</queryset>
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 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="dir_alpha_nav_bar.initial_list">
+ <querytext>
+
+ select distinct upper(substr(last_name,1,1))
+ from $table_and_group
+ </querytext>
+</fullquery>
+
+
+<fullquery name="dir_app_group_info.n_id">
+ <querytext>
+
+ select node_id from site_nodes
+ where object_id = :package_id
+
+ </querytext>
+</fullquery>
+
+
+<fullquery name="dir_app_group_info.g_i">
+ <querytext>
+
+ 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
+
+ </querytext>
+</fullquery>
+
+
+<fullquery name="dir_app_group_info.n_id">
+ <querytext>
+
+ select node_id from site_nodes
+ where object_id = :package_id
+
+ </querytext>
+</fullquery>
+
+<partialquery name="dir_alpha_nav_bar.table_and_group_1">
+ <querytext>
+ dir_all_users m where 1=1
+ </querytext>
+</partialquery>
+
+<partialquery name="dir_alpha_nav_bar.table_and_group_2">
+ <querytext>
+ dir_group_members m where group_id = :group_id
+ </querytext>
+</partialquery>
+
+</queryset>
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 @@
+<?xml version="1.0"?>
+<queryset>
+
+<fullquery name="total_users_1">
+ <querytext>
+
+ select count(1)
+ from $table_and_group
+ </querytext>
+</fullquery>
+
+
+<fullquery name="total_users_2">
+ <querytext>
+
+ select count(1)
+ from $table_and_group
+ </querytext>
+</fullquery>
+
+<partialquery name="table_and_group_1">
+ <querytext>
+ dir_all_users m where 1=1
+ </querytext>
+</partialquery>
+
+<partialquery name="table_and_group_2">
+ <querytext>
+ dir_group_members m where group_id = :group_id
+ </querytext>
+</partialquery>
+
+</queryset>