Index: openacs-4/packages/acs-admin/www/apm/bulk-install.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/Attic/bulk-install.xql,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/acs-admin/www/apm/bulk-install.xql 7 Apr 2018 17:25:32 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/bulk-install.xql 3 Apr 2021 14:10:06 -0000 1.1.2.1 @@ -1,15 +1,15 @@ - - - - select pretty_name, version_name, package_key - from apm_package_version_info i - where version_id = :version_id - - + + + + select pretty_name, version_name, package_key + from apm_package_version_info i + where version_id = :version_id + + - + Index: openacs-4/packages/acs-admin/www/apm/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index-oracle.xql,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/acs-admin/www/apm/index-oracle.xql 7 Aug 2017 23:47:45 -0000 1.8 +++ openacs-4/packages/acs-admin/www/apm/index-oracle.xql 3 Apr 2021 14:10:06 -0000 1.8.2.1 @@ -2,20 +2,20 @@ oracle8.1.6 - - - + + + select email from parties where party_id = :user_id - + - - + + - select v.version_id, v.package_key, t.pretty_name, v.version_name, - to_char(v.release_date, 'YYYY-MM-DD') as release_date, - v.enabled_p, v.installed_p, v.distribution_uri, + select v.version_id, v.package_key, t.pretty_name, v.version_name, + to_char(v.release_date, 'YYYY-MM-DD') as release_date, + v.enabled_p, v.installed_p, v.distribution_uri, (select count(*) from apm_package_versions v2 where v2.package_key = v.package_key and v2.installed_p = 't' @@ -30,7 +30,7 @@ $filter_where_clause [template::list::orderby_clause -name package_list -orderby] - + Index: openacs-4/packages/acs-admin/www/apm/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/index-postgresql.xql,v diff -u -r1.7 -r1.7.4.1 --- openacs-4/packages/acs-admin/www/apm/index-postgresql.xql 27 Oct 2014 16:38:51 -0000 1.7 +++ openacs-4/packages/acs-admin/www/apm/index-postgresql.xql 3 Apr 2021 14:10:06 -0000 1.7.4.1 @@ -2,27 +2,28 @@ postgresql7.1 - - + + - select v.version_id, v.package_key, t.pretty_name, v.version_name, - to_char(v.release_date, 'YYYY-MM-DD') as release_date, - v.enabled_p, v.installed_p, v.distribution_uri, - (select count(*) from apm_package_versions v2 - where v2.package_key = v.package_key - and v2.installed_p - and apm_package_version__sortable_version_name(v2.version_name) > - apm_package_version__sortable_version_name(v.version_name)) as superseded_p, - case - when content_item__get_latest_revision(item_id) is null - then 0 - else 1 - end as tarball_p - from apm_package_versions v, apm_package_types t - where t.package_key = v.package_key - $filter_where_clause - [template::list::orderby_clause -orderby -name package_list] - + select + v.version_id, v.package_key, t.pretty_name, v.version_name, + to_char(v.release_date, 'YYYY-MM-DD') as release_date, + v.enabled_p, v.installed_p, v.distribution_uri, + (select count(*) from apm_package_versions v2 + where v2.package_key = v.package_key + and v2.installed_p + and apm_package_version__sortable_version_name(v2.version_name) > + apm_package_version__sortable_version_name(v.version_name)) as superseded_p, + case + when content_item__get_latest_revision(item_id) is null + then 0 + else 1 + end as tarball_p + from apm_package_versions v, apm_package_types t + where t.package_key = v.package_key + $filter_where_clause + [template::list::orderby_clause -orderby -name package_list] + @@ -35,5 +36,5 @@ apm_package_version__sortable_version_name(v.version_name))) - + Index: openacs-4/packages/acs-admin/www/apm/package-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/package-add-2.xql,v diff -u -r1.2 -r1.2.32.1 --- openacs-4/packages/acs-admin/www/apm/package-add-2.xql 28 Apr 2001 17:35:30 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/package-add-2.xql 3 Apr 2021 14:10:06 -0000 1.2.32.1 @@ -1,49 +1,44 @@ - - - select case when count(*) = 0 then 0 else 1 end from apm_package_types - where pretty_plural = :pretty_plural - - + + + select case when count(*) = 0 then 0 else 1 end from apm_package_types + where pretty_plural = :pretty_plural + - - - - select case when count(*) = 0 then 0 else 1 end from apm_package_types - where pretty_name = :pretty_name - - + + + + select case when count(*) = 0 then 0 else 1 end from apm_package_types + where pretty_name = :pretty_name + - - - - select case when count(*) = 0 then 0 else 1 end from apm_package_types - where package_uri = :package_uri - - + + + + select case when count(*) = 0 then 0 else 1 end from apm_package_types + where package_uri = :package_uri + - - - - select case when count(*) = 0 then 0 else 1 end from apm_package_versions - where version_uri = :version_uri - - + + + + select case when count(*) = 0 then 0 else 1 end from apm_package_versions + where version_uri = :version_uri + - - - - select case when count(*) = 0 then 0 else 1 end from apm_package_versions - where version_id = :version_id - - + + + + select case when count(*) = 0 then 0 else 1 end from apm_package_versions + where version_id = :version_id + - + Index: openacs-4/packages/acs-admin/www/apm/packages-install-3-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3-oracle.xql,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-admin/www/apm/packages-install-3-oracle.xql 30 Nov 2002 17:13:06 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/packages-install-3-oracle.xql 3 Apr 2021 14:10:06 -0000 1.2.26.1 @@ -2,15 +2,15 @@ oracle8.1.6 - + - - select version_name from apm_package_versions - where package_key = :package_key - and version_id = apm_package.highest_version(:package_key) - + + select version_name from apm_package_versions + where package_key = :package_key + and version_id = apm_package.highest_version(:package_key) + - + Index: openacs-4/packages/acs-admin/www/apm/packages-install-3-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages-install-3-postgresql.xql,v diff -u -r1.2 -r1.2.26.1 --- openacs-4/packages/acs-admin/www/apm/packages-install-3-postgresql.xql 30 Nov 2002 17:13:06 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/packages-install-3-postgresql.xql 3 Apr 2021 14:10:06 -0000 1.2.26.1 @@ -2,15 +2,15 @@ postgresql7.1 - - - - select version_name from apm_package_versions - where package_key = :package_key - and version_id = apm_package__highest_version(:package_key) - - + + + + select version_name from apm_package_versions + where package_key = :package_key + and version_id = apm_package__highest_version(:package_key) + + - + Index: openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql,v diff -u -r1.3 -r1.3.32.1 --- openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql 23 Feb 2002 02:43:45 -0000 1.3 +++ openacs-4/packages/acs-admin/www/apm/parameter-add-2.xql 3 Apr 2021 14:10:06 -0000 1.3.32.1 @@ -1,23 +1,21 @@ - - - select case when count(*) = 0 then 0 else 1 end - from apm_parameters - where parameter_name = :parameter_name and - package_key = :package_key - + + + select case when count(*) = 0 then 0 else 1 end + from apm_parameters + where parameter_name = :parameter_name and + package_key = :package_key + - - - - - select 1 from apm_parameters where parameter_id = :parameter_id - - + + + + select 1 from apm_parameters where parameter_id = :parameter_id + - + Index: openacs-4/packages/acs-admin/www/apm/parameter-add.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/parameter-add.xql,v diff -u -r1.2 -r1.2.8.1 --- openacs-4/packages/acs-admin/www/apm/parameter-add.xql 4 Oct 2010 21:59:20 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/parameter-add.xql 3 Apr 2021 14:10:06 -0000 1.2.8.1 @@ -1,15 +1,15 @@ - - - + + + select package_key, pretty_name, version_name from apm_package_version_info where version_id = :version_id - + - + Index: openacs-4/packages/acs-admin/www/apm/version-dependencies-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies-oracle.xql,v diff -u -r1.3 -r1.3.4.1 --- openacs-4/packages/acs-admin/www/apm/version-dependencies-oracle.xql 27 Oct 2014 16:38:53 -0000 1.3 +++ openacs-4/packages/acs-admin/www/apm/version-dependencies-oracle.xql 3 Apr 2021 14:10:06 -0000 1.3.4.1 @@ -2,41 +2,41 @@ oracle8.1.6 - - - - select package_key, pretty_name, version_name, installed_p - from apm_package_version_info + + + + select package_key, pretty_name, version_name, installed_p + from apm_package_version_info where version_id = :version_id - + - - - - - select dependency_id, service_uri, service_version - from apm_package_dependencies - where version_id = :version_id - and dependency_type = :dependency_type_prep - order by service_uri - - + + + + + select dependency_id, service_uri, service_version + from apm_package_dependencies + where version_id = :version_id + and dependency_type = :dependency_type_prep + order by service_uri + + - - + + select t.pretty_name dep_pretty_name, v.version_name dep_version_name, v.version_id dep_version_id, d.dependency_type as dep_type from apm_package_versions v, apm_package_dependencies d, apm_package_types t where d.service_uri = :service_uri and d.dependency_type in ($other_dependency_in) and d.version_id = v.version_id - and t.package_key = v.package_key + and t.package_key = v.package_key and apm_package_version.sortable_version_name(d.service_version) $sign apm_package_version.sortable_version_name(:service_version) - + Index: openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql,v diff -u -r1.3 -r1.3.12.1 --- openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql 13 Apr 2009 23:10:27 -0000 1.3 +++ openacs-4/packages/acs-admin/www/apm/version-dependencies-postgresql.xql 3 Apr 2021 14:10:06 -0000 1.3.12.1 @@ -1,42 +1,42 @@ - postgresql7.1 + postgresql7.1 - - - - select package_key, pretty_name, version_name, installed_p - from apm_package_version_info + + + + select package_key, pretty_name, version_name, installed_p + from apm_package_version_info where version_id = :version_id - + - - - - - select dependency_id, service_uri, service_version - from apm_package_dependencies - where version_id = :version_id - and dependency_type = :dependency_type_prep - order by service_uri - - + + + + + select dependency_id, service_uri, service_version + from apm_package_dependencies + where version_id = :version_id + and dependency_type = :dependency_type_prep + order by service_uri + + - - - + + + select t.pretty_name as dep_pretty_name, v.version_name as dep_version_name, v.version_id as dep_version_id, d.dependency_type as dep_type from apm_package_versions v, apm_package_dependencies d, apm_package_types t where d.service_uri = :service_uri and d.dependency_type in ($other_dependency_in) and d.version_id = v.version_id - and t.package_key = v.package_key + and t.package_key = v.package_key and apm_package_version__sortable_version_name(d.service_version) $sign apm_package_version__sortable_version_name(:service_version) - + Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.xql,v diff -u -r1.1 -r1.1.32.1 --- openacs-4/packages/acs-admin/www/apm/version-dependencies.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-dependencies.xql 3 Apr 2021 14:10:06 -0000 1.1.32.1 @@ -1,27 +1,23 @@ - - - - select package_key, pretty_name, version_name, installed_p - from apm_package_version_info + + + select package_key, pretty_name, version_name, installed_p + from apm_package_version_info where version_id = :version_id - - + - - - - - select dependency_id, service_uri, service_version - from apm_package_dependencies - where version_id = :version_id - and dependency_type = :dependency_type_prep - order by service_uri - - + + + + select dependency_id, service_uri, service_version + from apm_package_dependencies + where version_id = :version_id + and dependency_type = :dependency_type_prep + order by service_uri + Index: openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.xql,v diff -u -r1.1 -r1.1.32.1 --- openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.xql 27 Apr 2001 01:41:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/apm/version-dependency-add-2.xql 3 Apr 2021 14:10:06 -0000 1.1.32.1 @@ -1,14 +1,13 @@ - - - - select count(*) from apm_package_dependencies - where dependency_id = :dependency_id - - + + + + select count(*) from apm_package_dependencies + where dependency_id = :dependency_id + + - Index: openacs-4/packages/acs-admin/www/apm/version-edit-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit-2.xql,v diff -u -r1.4.20.1 -r1.4.20.2 --- openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 23 Oct 2020 17:03:05 -0000 1.4.20.1 +++ openacs-4/packages/acs-admin/www/apm/version-edit-2.xql 3 Apr 2021 14:10:06 -0000 1.4.20.2 @@ -1,24 +1,19 @@ - - - select case when count(*) = 0 then 0 else 1 end from apm_package_versions - where version_uri = :version_uri - - + + + select case when count(*) = 0 then 0 else 1 end from apm_package_versions + where version_uri = :version_uri + - - - - - select version_name as old_version_name, version_uri as old_version_uri - from apm_package_versions - where version_id = :version_id - - + + + select version_name as old_version_name, version_uri as old_version_uri + from apm_package_versions + where version_id = :version_id + - Index: openacs-4/packages/acs-admin/www/apm/packages/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages/index-oracle.xql,v diff -u -r1.2.32.1 -r1.2.32.2 --- openacs-4/packages/acs-admin/www/apm/packages/index-oracle.xql 23 Oct 2020 17:03:05 -0000 1.2.32.1 +++ openacs-4/packages/acs-admin/www/apm/packages/index-oracle.xql 3 Apr 2021 14:10:06 -0000 1.2.32.2 @@ -3,32 +3,32 @@ oracle8.1.6 - - + + - select count(*) - from cr_revisions - where revision_id = (select content_item.get_latest_revision(item_id) + select count(*) + from cr_revisions + where revision_id = (select content_item.get_latest_revision(item_id) from apm_package_versions - where version_id = :version_id) + where version_id = :version_id) - + - - - - - select '[cr_fs_path]' || filename as content, + + + + + select '[cr_fs_path]' || filename as content, '[set storage_type file]' as storage_type - from cr_revisions - where revision_id = (select content_item.get_latest_revision(item_id) + from cr_revisions + where revision_id = (select content_item.get_latest_revision(item_id) from apm_package_versions - where version_id = :version_id) + where version_id = :version_id) - + - + Index: openacs-4/packages/acs-admin/www/apm/packages/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/packages/index-postgresql.xql,v diff -u -r1.2 -r1.2.32.1 --- openacs-4/packages/acs-admin/www/apm/packages/index-postgresql.xql 12 May 2001 05:09:48 -0000 1.2 +++ openacs-4/packages/acs-admin/www/apm/packages/index-postgresql.xql 3 Apr 2021 14:10:06 -0000 1.2.32.1 @@ -3,31 +3,31 @@ postgresql7.1 - - + + - select count(*) - from cr_revisions - where revision_id = (select content_item__get_latest_revision(item_id) + select count(*) + from cr_revisions + where revision_id = (select content_item__get_latest_revision(item_id) from apm_package_versions - where version_id = :version_id) + where version_id = :version_id) - + - - - + + + select '[cr_fs_path]' || r.content as content, i.storage_type from cr_revisions r, cr_items i - where r.item_id = i.item_id - and r.revision_id = (select content_item__get_latest_revision(item_id) + where r.item_id = i.item_id + and r.revision_id = (select content_item__get_latest_revision(item_id) from apm_package_versions - where version_id = :version_id) + where version_id = :version_id) - + - + Index: openacs-4/packages/acs-admin/www/auth/batch-job.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/auth/batch-job.xql,v diff -u -r1.1 -r1.1.26.1 --- openacs-4/packages/acs-admin/www/auth/batch-job.xql 28 Oct 2003 14:32:12 -0000 1.1 +++ openacs-4/packages/acs-admin/www/auth/batch-job.xql 3 Apr 2021 14:10:06 -0000 1.1.26.1 @@ -3,14 +3,14 @@ - + select entry_id from auth_batch_job_entries where job_id = :job_id [template::list::filter_where_clauses -and -name batch_actions] order by entry_id - + - + Index: openacs-4/packages/acs-admin/www/users/bouncing-users.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/bouncing-users.xql,v diff -u -r1.2 -r1.2.12.1 --- openacs-4/packages/acs-admin/www/users/bouncing-users.xql 3 Jun 2008 10:59:41 -0000 1.2 +++ openacs-4/packages/acs-admin/www/users/bouncing-users.xql 3 Apr 2021 14:10:06 -0000 1.2.12.1 @@ -4,10 +4,10 @@ - select username, (first_names || ' ' || last_name) as full_name, user_id + select username, (first_names || ' ' || last_name) as full_name, user_id from cc_users u where u.email_bouncing_p = 't' - [template::list::orderby_clause -name bouncing_users -orderby] + [template::list::orderby_clause -name bouncing_users -orderby] Index: openacs-4/packages/acs-admin/www/users/merge.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.xql,v diff -u -r1.2.16.1 -r1.2.16.2 --- openacs-4/packages/acs-admin/www/users/merge.xql 3 Sep 2019 10:52:23 -0000 1.2.16.1 +++ openacs-4/packages/acs-admin/www/users/merge.xql 3 Apr 2021 14:10:06 -0000 1.2.16.2 @@ -1,109 +1,108 @@ - + - select - c.item_id - from acs_rels a, cr_items c - where a.object_id_two = c.item_id + select + c.item_id + from acs_rels a, cr_items c + where a.object_id_two = c.item_id and a.object_id_one = :user_id - and a.rel_type = 'user_portrait_rel' + and a.rel_type = 'user_portrait_rel' - select - first_names as one_first_names, - last_name as one_last_name, - creation_user as one_creation_user, - to_char(creation_date,'month DD, yyyy') as one_creation_date, - creation_ip as one_creation_ip, - to_char(last_modified,'month DD, yyyy') as one_last_modified, - email as one_email, - url as one_url, - modifying_user as one_modifying_user, - modifying_ip as one_modifying_ip, - username as one_username, - screen_name as one_screen_name, - to_char(last_visit,'month DD, yyyy') as one_last_visit, - member_state as one_member_state - from cc_users - where user_id = :user_id + select + first_names as one_first_names, + last_name as one_last_name, + creation_user as one_creation_user, + to_char(creation_date,'month DD, yyyy') as one_creation_date, + creation_ip as one_creation_ip, + to_char(last_modified,'month DD, yyyy') as one_last_modified, + email as one_email, + url as one_url, + modifying_user as one_modifying_user, + modifying_ip as one_modifying_ip, + username as one_username, + screen_name as one_screen_name, + to_char(last_visit,'month DD, yyyy') as one_last_visit, + member_state as one_member_state + from cc_users + where user_id = :user_id - + - select - c.item_id - from acs_rels a, cr_items c - where a.object_id_two = c.item_id - and a.object_id_one = :user_id_from_search - and a.rel_type = 'user_portrait_rel' + select + c.item_id + from acs_rels a, cr_items c + where a.object_id_two = c.item_id + and a.object_id_one = :user_id_from_search + and a.rel_type = 'user_portrait_rel' - + - select - first_names as two_first_names, - last_name as two_last_name, - creation_user as two_creation_user, - to_char(creation_date,'month DD, yyyy') as two_creation_date, - creation_ip as two_creation_ip, - to_char(last_modified,'month DD, yyyy') as two_last_modified, - email as two_email, - url as two_url, - modifying_user as two_modifying_user, - modifying_ip as two_modifying_ip, - username as two_username, - screen_name as two_screen_name, - to_char(last_visit,'month DD, yyyy') as two_last_visit, - member_state as two_member_state - from cc_users - where user_id = :user_id_from_search + select + first_names as two_first_names, + last_name as two_last_name, + creation_user as two_creation_user, + to_char(creation_date,'month DD, yyyy') as two_creation_date, + creation_ip as two_creation_ip, + to_char(last_modified,'month DD, yyyy') as two_last_modified, + email as two_email, + url as two_url, + modifying_user as two_modifying_user, + modifying_ip as two_modifying_ip, + username as two_username, + screen_name as two_screen_name, + to_char(last_visit,'month DD, yyyy') as two_last_visit, + member_state as two_member_state + from cc_users + where user_id = :user_id_from_search - select + select a.object_id, - at.pretty_name, - at.pretty_plural, - to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date, - acs_object.name(a.object_id) as object_name + at.pretty_name, + at.pretty_plural, + to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date, + acs_object.name(a.object_id) as object_name from acs_objects a, acs_object_types at where a.object_type = at.object_type - and a.creation_user = :user_id - order by pretty_name, - creation_date desc, - object_name + and a.creation_user = :user_id + order by pretty_name, + creation_date desc, + object_name - select + select a.object_id, - at.pretty_name, - at.pretty_plural, - to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date, - acs_object.name(a.object_id) as object_name + at.pretty_name, + at.pretty_plural, + to_char(a.creation_date, 'YYYY-MM-DD HH24:MI:SS') as creation_date, + acs_object.name(a.object_id) as object_name from acs_objects a, acs_object_types at where a.object_type = at.object_type - and a.creation_user = :user_id_from_search - order by pretty_name, - creation_date desc, - object_name + and a.creation_user = :user_id_from_search + order by pretty_name, + creation_date desc, + object_name -