Index: openacs-4/packages/acs-subsite/www/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/index-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/index-oracle.xql 30 Apr 2001 20:07:31 -0000 1.1 @@ -0,0 +1,27 @@ + + + + oracle8.1.6 + + + + + select acs_object.name(:package_id) from dual + + + + + + + + + select site_node.url(n.node_id) as url, acs_object.name(n.object_id) as name + from site_nodes n + where n.parent_id = :node_id + and n.object_id is not null + + + + + + Index: openacs-4/packages/acs-subsite/www/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/Attic/index-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/index-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/index-postgresql.xql 30 Apr 2001 20:07:31 -0000 1.3 @@ -1,20 +1,27 @@ + -postgresql7.1 + postgresql7.1 - - - select acs_object__name(:package_id) from dual - + + + + select acs_object__name(:package_id) + + - - + + + + select site_node__url(n.node_id) as url, acs_object__name(n.object_id) as name from site_nodes n where n.parent_id = :node_id and n.object_id is not null - + + + Index: openacs-4/packages/acs-subsite/www/admin/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/index-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/index-oracle.xql 30 Apr 2001 20:11:23 -0000 1.1 @@ -0,0 +1,19 @@ + + + + oracle8.1.6 + + + + + select site_node.url(node_id) acs_admin_url, instance_name + from site_nodes s, apm_packages p + where s.object_id = p.package_id + and p.package_key = 'acs-admin' + and rownum = 1 + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/index-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/index-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/index-postgresql.xql 30 Apr 2001 20:11:23 -0000 1.3 @@ -1,15 +1,19 @@ + -postgresql7.1 + postgresql7.1 - - + + + select site_node__url(node_id) as acs_admin_url, instance_name from site_nodes s, apm_packages p where s.object_id = p.package_id and p.package_key = 'acs-admin' limit 1 - + + + Index: openacs-4/packages/acs-subsite/www/admin/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/Attic/index.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/index.xql 30 Apr 2001 20:11:23 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select p.instance_name + from apm_packages p + where p.package_id = :package_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/auto-mount-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,18 @@ + + + + oracle8.1.6 + + + + + select site_node.url(s.node_id) as return_url + from site_nodes s, apm_packages p + where s.object_id = p.package_id + and s.node_id = :node_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/auto-mount-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,14 +1,18 @@ + -postgresql7.1 + postgresql7.1 - - + + + select site_node__url(s.node_id) as return_url from site_nodes s, apm_packages p where s.object_id = p.package_id - and s.node_id = :node_id - + and s.node_id = :node_id + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/delete-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/delete-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,17 @@ + + + + oracle8.1.6 + + + + + begin + site_node.delete(:node_id); + end; + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/delete-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/delete-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/delete-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,11 +1,15 @@ + -postgresql7.1 + postgresql7.1 - - + + + select site_node__delete(:node_id) - + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/delete.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select parent_id + from site_nodes + where node_id = :node_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,90 @@ + + + + oracle8.1.6 + + + + + select node_id, name, directory_p, level, + acs_object.name(object_id) as obj_name, + acs_permission.permission_p(object_id, :user_id, 'admin') as admin_p + from site_nodes + start with node_id = :root_id + connect by node_id = prior parent_id + order by level desc + + + + + + + + select site_node.node_id('/') from dual + + + + + + + +select package_id, + package_key, + apm_package_type.num_parameters(package_key) parameter_count, + node_id, url, parent_url, name, root_p, mylevel - 1 as mylevel, object_id, + object_name, directory_p, parent_id, n_children, + (select decode(acs_permission.permission_p(object_id, :user_id, 'admin'), + 't', 1, 0) from dual) object_admin_p +from apm_packages p, ( + select node_id, site_node.url(node_id) as url, + site_node.url(parent_id) as parent_url, + name, + (select count(*) + from site_nodes + where parent_id = n.node_id) as n_children, + decode(node_id, site_node.node_id('/'), 1, 0) as root_p, + level as mylevel, + object_id, + acs_object.name(object_id) as object_name, + directory_p, + parent_id + from site_nodes n + where (object_id is null or + acs_permission.permission_p(object_id, :user_id, 'read') = 't') + start with node_id = nvl(:root_id, site_node.node_id('/')) + connect by prior node_id = parent_id and parent_id in ([join $expand ", "])) site_map + where site_map.object_id = p.package_id (+) + + + + + + + + + select package_key, pretty_name + from apm_package_types + where not (apm_package.singleton_p(package_key) = 1 and + apm_package.num_instances(package_key) >= 1) + order by pretty_name + + + + + + + + + select package_id, ap.package_key, acs_object.name(package_id) instance_name, + apm_package_type.num_parameters(ap.package_key) parameter_count + from apm_packages ap, apm_package_types + where ap.package_key = apm_package_types.package_key + and package_type = 'apm_service' + and (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,26 +1,31 @@ + -postgresql7.1 + postgresql7.1 - - + + + select node_id, name, directory_p, tree_level(tree_sortkey) as level, acs_object__name(object_id) as obj_name, acs_permission__permission_p(object_id, :user_id, 'admin') as admin_p from site_nodes where tree_sortkey like (select tree_sortkey from site_nodes where node_id = :root_id) || '%' order by level desc - - - - -select site_node__node_id('/', null) - - + + - - + + + + select site_node__node_id('/', null) + + + + + + select package_id, package_key, apm_package_type__num_parameters(package_key) as parameter_count, @@ -36,6 +41,7 @@ where parent_id = n.node_id) as n_children, case when node_id = site_node__node_id('/', null) then 1 else 0 end as root_p, tree_level(tree_sortkey) as mylevel, + tree_sortkey, object_id, acs_object__name(object_id) as object_name, directory_p, @@ -46,29 +52,38 @@ tree_sortkey like (select tree_sortkey from site_nodes where node_id = coalesce(:root_id, site_node__node_id('/', null))) || '%' and (parent_id is null or parent_id in ([join $expand ", "]))) site_map on site_map.object_id = p.package_id - - + order by site_map.tree_sortkey - - - select package_key, pretty_name - from apm_package_types - where not (apm_package__singleton_p(package_key) = 1 and - apm_package__num_instances(package_key) >= 1) - order by pretty_name - - + + - - + + + + + select package_key, pretty_name + from apm_package_types + where not (apm_package__singleton_p(package_key) = 1 and + apm_package__num_instances(package_key) >= 1) + order by pretty_name + + + + + + + + select package_id, ap.package_key, acs_object__name(package_id) as instance_name, apm_package_type__num_parameters(ap.package_key) as parameter_count from apm_packages ap, apm_package_types where ap.package_key = apm_package_types.package_key and package_type = 'apm_service' and (acs_permission__permission_p(package_id, :user_id, 'read') = 't' or acs_permission__permission_p(package_id, acs__magic_object_id('the_public'), 'read') = 't') - - + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/index.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select parent_id, object_id + from site_nodes + where node_id = :root_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/instance-delete-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,17 @@ + + + + oracle8.1.6 + + + + + begin + apm_package.delete(package_id => :package_id); + end; + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/instance-delete-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,27 +1,15 @@ + -postgresql7.1 + postgresql7.1 - - - select case when count(*) = 0 then 0 else 1 end - from apm_packages p, site_nodes s - where package_id = :package_id - and p.package_id = s.object_id - - + + - - select apm_package__delete(:package_id) - + + - - - select case when count(*) = 0 then 0 else 1 end from apm_packages - where package_id = :package_id - - - + Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/instance-delete.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,26 @@ + + + + + + + select case when count(*) = 0 then 0 else 1 end + from apm_packages p, site_nodes s + where package_id = :package_id + and p.package_id = s.object_id + + + + + + + + + select case when count(*) = 0 then 0 else 1 end from apm_packages + where package_id = :package_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/mount-2.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,16 @@ + + + + + + + update site_nodes + set object_id = :package_id + where node_id = :node_id + and object_id is null + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,69 @@ + + + + oracle8.1.6 + + + + + select site_node.url(:node_id) from dual + + + + + + + + + select package_id, acs_object.name(package_id) as name + from + apm_packages + where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + and apm_package.singleton_p(package_key) = 0 + and not exists (select 1 + from site_nodes + where object_id = package_id) + + order by name + + + + + + + + + select package_id, acs_object.name(package_id) as name + from + apm_packages + where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + and exists (select 1 + from site_nodes + where object_id = package_id) + order by name + + + + + + + + + select package_id, acs_object.name(package_id) as name + from + apm_packages + where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + and apm_package.singleton_p(package_key) = 1 + and not exists (select 1 + from site_nodes + where object_id = package_id) + order by name + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,15 +1,20 @@ + -postgresql7.1 + postgresql7.1 - - - select site_node__url(:node_id) from dual - + + + + select site_node__url(:node_id) + + - - + + + + select package_id, acs_object__name(package_id) as name from apm_packages @@ -19,12 +24,16 @@ and not exists (select 1 from site_nodes where object_id = package_id) + order by name - + + - - + + + + select package_id, acs_object__name(package_id) as name from apm_packages @@ -34,11 +43,14 @@ from site_nodes where object_id = package_id) order by name - + + - - + + + + select package_id, acs_object__name(package_id) as name from apm_packages @@ -49,7 +61,9 @@ from site_nodes where object_id = package_id) order by name - + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/new-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/new-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,25 @@ + + + + oracle8.1.6 + + + + + begin + :1 := site_node.new ( + node_id => :new_node_id, + parent_id => :parent_id, + name => :name, + directory_p => :directory_p, + pattern_p => :pattern_p, + creation_user => :user_id, + creation_ip => :ip_address + ); + end; + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/new-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/new-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/new-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,39 +1,24 @@ + -postgresql7.1 + postgresql7.1 - - - select case when count(*) = 0 then 0 else 1 end - from site_nodes - where name = :name - and parent_id = :parent_id - and node_id <> :new_node_id - - - + + - - select site_node__new ( - :new_node_id, - :parent_id, - :name, - null, - :directory_p, - :pattern_p, - :user_id, - :ip_address + :new_node_id, + :parent_id, + :name, + null, + :directory_p, + :pattern_p, + :user_id, + :ip_address ) - + + - - - select case when count(*) = 0 then 0 else 1 end - from site_nodes - where node_id = :new_node_id - - - + Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,28 @@ + + + + + + + select case when count(*) = 0 then 0 else 1 end + from site_nodes + where name = :name + and parent_id = :parent_id + and node_id <> :new_node_id + + + + + + + + + select case when count(*) = 0 then 0 else 1 end + from site_nodes + where node_id = :new_node_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select case when count(*) = 0 then 0 else 1 end + from apm_packages + where package_id = :new_package_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + select parameter_id, parameter_name + from apm_parameters + where package_key = :package_key + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,32 @@ + + + + oracle8.1.6 + + + + + select package_key, acs_object.name(package_id) instance_name + from apm_packages + where package_id = :package_id + + + + + + + + +select p.parameter_id, p.parameter_name, nvl(p.description, 'No Description') description, + nvl(v.attr_value, 'No Value') attr_value, nvl(p.section_name, 'No Section Name') section_name + from apm_parameters p, (select parameter_id, attr_value + from apm_parameter_values v + where v.package_id = :package_id) v + where p.parameter_id = v.parameter_id(+) + and p.package_key = (select package_key from apm_packages where package_id = :package_id) + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 27 Apr 2001 05:08:34 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.3 @@ -1,32 +1,32 @@ + -postgresql7.1 + postgresql7.1 - - - + + + select package_key, acs_object__name(package_id) as instance_name from apm_packages where package_id = :package_id - + - - + + + - select p.parameter_id, p.parameter_name, - coalesce(p.description, 'No Description') as description, - coalesce(v.attr_value, 'No Value') as attr_value, - coalesce(p.section_name, 'No Section Name') as section_name - from apm_parameters p left outer join (select parameter_id, attr_value - from apm_parameter_values v - where v.package_id = :package_id) v - using (parameter_id) - where p.package_key = (select package_key from apm_packages where package_id = :package_id) - $additional_sql +select p.parameter_id, p.parameter_name, coalesce(p.description, 'No Description') as description, + coalesce(v.attr_value, 'No Value') as attr_value, coalesce(p.section_name, 'No Section Name') as section_name + from apm_parameters p left outer join (select parameter_id, attr_value + from apm_parameter_values v + where v.package_id = :package_id) v + on p.parameter_id = v.parameter_id + where p.package_key = (select package_key from apm_packages where package_id = :package_id) - + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmount.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/unmount.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/unmount.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,15 @@ + + + + + + + update site_nodes + set object_id = null + where node_id = :node_id + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/unmounted-oracle.xql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 @@ -0,0 +1,42 @@ + + + + oracle8.1.6 + + + + + select package_id, acs_object.name(package_id) as name + from + apm_packages + where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + and apm_package.singleton_p(package_key) = 0 + and not exists (select 1 + from site_nodes + where object_id = package_id) + order by name + + + + + + + + + select package_id, acs_object.name(package_id) as name + from + apm_packages + where (acs_permission.permission_p(package_id, :user_id, 'read') = 't' or + acs_permission.permission_p(package_id, acs.magic_object_id('the_public'), 'read') = 't') + and apm_package.singleton_p(package_key) = 1 + and not exists (select 1 + from site_nodes + where object_id = package_id) + order by name + + + + + + Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/unmounted-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 @@ -1,9 +1,11 @@ + -postgresql7.1 + postgresql7.1 - - + + + select package_id, acs_object__name(package_id) as name from apm_packages @@ -14,11 +16,14 @@ from site_nodes where object_id = package_id) order by name - + + - - + + + + select package_id, acs_object__name(package_id) as name from apm_packages @@ -29,7 +34,9 @@ from site_nodes where object_id = package_id) order by name - + + + Index: openacs-4/packages/acs-subsite/www/permissions/toggle-inherit-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/Attic/toggle-inherit-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/permissions/toggle-inherit-postgresql.xql 22 Apr 2001 16:13:15 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/permissions/toggle-inherit-postgresql.xql 30 Apr 2001 20:10:53 -0000 1.2 @@ -5,7 +5,7 @@ update acs_objects - set security_inherit_p = case when security_inherit_p = 't' then 'f' else 't' end + set security_inherit_p = not security_inherit_p where object_id = :object_id