Index: openacs-4/packages/acs-subsite/acs-subsite.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/acs-subsite.info,v diff -u -N -r1.30 -r1.31 --- openacs-4/packages/acs-subsite/acs-subsite.info 3 May 2002 03:24:23 -0000 1.30 +++ openacs-4/packages/acs-subsite/acs-subsite.info 21 Jun 2002 19:08:33 -0000 1.31 @@ -420,31 +420,19 @@ - - - - - - - - - - - - @@ -453,7 +441,6 @@ - @@ -577,7 +564,11 @@ + + + + @@ -595,6 +586,7 @@ + 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ - - - - 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ - - - - 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 - - - - - - Index: openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/auto-mount.tcl 21 Jun 2002 19:08:33 -0000 1.2 @@ -6,24 +6,18 @@ @author mbryzek@arsdigita.com @creation-date Fri Feb 9 20:27:26 2001 - @cvs-id $Id$ + @version $Id$ } { package_key:notnull node_id:integer,notnull - { return_url "" } + {return_url ""} } subsite::auto_mount_application -node_id $node_id $package_key -if { [empty_string_p $return_url] } { - # Go back to the node - db_1row select_node_url { - 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 - } +if {[empty_string_p $return_url]} { + set return_url [site_node::get_url -node_id] } ad_returnredirect $return_url 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/delete-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ - - - - 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/delete-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ - - - - postgresql7.1 - - - - - select site_node__delete(:node_id) - - - - - - Index: openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 22 Apr 2001 16:13:15 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/delete.tcl 21 Jun 2002 19:08:33 -0000 1.3 @@ -2,30 +2,20 @@ ad_page_contract { - @author rhs@mit.edu - @creation-date 2000-09-09 - @cvs-id $Id$ + @author rhs@mit.edu + @creation-date 2000-09-09 + @version $Id$ + } { - expand:integer,multiple - node_id:integer,notnull - {root_id:integer {}} + expand:integer,multiple + node_id:integer,notnull + {root_id:integer ""} } -db_transaction { - - if {$root_id == $node_id} { - set root_id [db_string parent_select { - select parent_id - from site_nodes - where node_id = :node_id - }] - } - - db_exec_plsql node_delete { - begin - site_node.delete(:node_id); - end; - } +if {$root_id == $node_id} { + set root_id [site_node::get_parent_id -node_id $node_id] } -ad_returnredirect .?[export_url_vars expand:multiple root_id] +site_node::delete -node_id $node_id + +ad_returnredirect ".?[export_url_vars expand:multiple root_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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/delete.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ - - - - - - - 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 -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql 23 Feb 2002 21:14:24 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-oracle.xql 21 Jun 2002 19:08:33 -0000 1.3 @@ -1,83 +1,89 @@ - oracle8.1.6 + 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 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 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, + decode(acs_permission.permission_p(object_id, :user_id, 'admin'), 't', 1, 0) 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_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) 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' + ) + + - - - - - 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 -N -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 23 Feb 2002 21:14:24 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index-postgresql.xql 21 Jun 2002 19:08:33 -0000 1.7 @@ -1,85 +1,83 @@ - postgresql7.1 + postgresql7.1 - - - - select s2.node_id, s2.name, s2.directory_p, tree_level(s2.tree_sortkey) as level, - acs_object__name(s2.object_id) as obj_name, - acs_permission__permission_p(s2.object_id, :user_id, 'admin') as admin_p - from (select tree_ancestor_keys(site_node_get_tree_sortkey(:root_id)) as tree_sortkey) parents, - site_nodes s2 - where s2.tree_sortkey = parents.tree_sortkey - order by level + + + select s2.node_id, + s2.name, + s2.directory_p, + tree_level(s2.tree_sortkey) as level, + acs_object__name(s2.object_id) as obj_name, + acs_permission__permission_p(s2.object_id, :user_id, 'admin') as admin_p + from (select tree_ancestor_keys(site_node_get_tree_sortkey(:root_id)) as tree_sortkey) parents, + site_nodes s2 + where s2.tree_sortkey = parents.tree_sortkey + order by level + + - - + + + select package_id, + package_key, + apm_package_type__num_parameters(package_key) as parameter_count, + node_id, url, parent_url, name, root_p, mylevel, object_id, + object_name, directory_p, parent_id, n_children, + (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p + from apm_packages p right outer join + (select n.node_id, + site_node__url(n.node_id) as url, + site_node__url(n.parent_id) as parent_url, + n.name, + (select count(*) + from site_nodes + where parent_id = n.node_id) as n_children, + case when n.node_id = site_node__node_id('/', null) then 1 else 0 end as root_p, + (select tree_level(n.tree_sortkey) - tree_level(n2.tree_sortkey) + from site_nodes n2 + where n2.node_id = coalesce(:root_id, site_node__node_id('/', null))) as mylevel, + n.object_id, + acs_object__name(n.object_id) as object_name, + n.directory_p, + n.parent_id + from site_nodes n, site_nodes n2 + where (n.object_id is null or acs_permission__permission_p(n.object_id, :user_id, 'read')) + and n2.node_id = coalesce(:root_id, site_node__node_id('/', null)) + and n.tree_sortkey between n2.tree_sortkey and tree_right(n2.tree_sortkey) + and (n.parent_id is null or n.parent_id in ([join $expand ", "]))) site_map + on site_map.object_id = p.package_id + order by url + + - - - -select package_id, - package_key, - apm_package_type__num_parameters(package_key) as parameter_count, - node_id, url, parent_url, name, root_p, mylevel, object_id, - object_name, directory_p, parent_id, n_children, - (select case when acs_permission__permission_p(object_id, :user_id, 'admin') = 't' then 1 else 0 end) as object_admin_p -from apm_packages p right outer join ( - select n.node_id, site_node__url(n.node_id) as url, - site_node__url(n.parent_id) as parent_url, - n.name, - (select count(*) - from site_nodes - where parent_id = n.node_id) as n_children, - case when n.node_id = site_node__node_id('/', null) then 1 else 0 end as root_p, - (select tree_level(n.tree_sortkey) - tree_level(n2.tree_sortkey) - from site_nodes n2 - where n2.node_id = coalesce(:root_id, site_node__node_id('/', null))) as mylevel, - n.object_id, - acs_object__name(n.object_id) as object_name, - n.directory_p, - n.parent_id - from site_nodes n, site_nodes n2 - where (n.object_id is null or acs_permission__permission_p(n.object_id, :user_id, 'read')) - and n2.node_id = coalesce(:root_id, site_node__node_id('/', null)) - and n.tree_sortkey between n2.tree_sortkey and tree_right(n2.tree_sortkey) - and (n.parent_id is null or n.parent_id in ([join $expand ", "]))) site_map - on site_map.object_id = p.package_id - order by url + + + 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' + ) + order by instance_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') - order by instance_name - - - - - Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 17 Jun 2002 20:21:59 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl 21 Jun 2002 19:08:33 -0000 1.5 @@ -1,19 +1,20 @@ ad_page_contract { - @author rhs@mit.edu - @author bquinn@arsidigta.com - @creation-date 2000-09-09 - @cvs-id $Id$ + @author rhs@mit.edu + @author bquinn@arsidigta.com + @creation-date 2000-09-09 + @version $Id$ + } { - {expand:integer,multiple {}} - {new_parent:integer {}} - {new_type ""} - {root_id:integer {}} - {new_application:integer {}} + {expand:integer,multiple ""} + {new_parent:integer ""} + {new_type ""} + {root_id:integer ""} + {new_application:integer ""} } if {[empty_string_p $root_id]} { - set root_id [ad_conn node_id] + set root_id [ad_conn node_id] } # We do a check for the admin privilege because a user could have @@ -22,11 +23,9 @@ # check, the user could end up making changes on site_nodes that he # does not have the admin privilege for. -db_1row root_node { - select parent_id, object_id - from site_nodes - where node_id = :root_id -} +array set node [site_node::get -node_id $root_id] +set parent_id $node(parent_id) +set object_id $node(object_id) if {![empty_string_p $object_id]} { ad_require_permission $object_id admin @@ -59,15 +58,7 @@ set user_id [ad_conn user_id] -db_foreach path_select { - 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 -} { +db_foreach path_select {} { if {$node_id != $root_id && $admin_p == "t"} { doc_body_append "" } @@ -108,34 +99,7 @@ # containing connect by. However, if you rename the column, Oracle is happy to give # it to you. We could tell you how we figured this out, but then we would have to kill you. -db_foreach nodes_select " -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 (+) -" { +db_foreach nodes_select {} { doc_body_append "" for {set i 0} {$i < 3*$mylevel} {incr i} { doc_body_append " " @@ -254,9 +218,8 @@ doc_body_append " " } # Generate a node_id for doubleclick protection. - set new_node_id [db_nextval acs_object_id_seq] doc_body_append " - [export_form_vars expand:multiple parent_id node_type root_id new_node_id] + [export_form_vars expand:multiple parent_id node_type root_id] @@ -287,15 +250,7 @@ " -db_foreach services_select { - 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') -} { +db_foreach services_select {} { set options [list] if {$parameter_count > 0} { if {[ad_permission_p $package_id admin]} { 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/index.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ - - - - - - - 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ - - - - 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ - - - - postgresql7.1 - - - - - select apm_package__delete(:package_id) - - - - - - Index: openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 17 Feb 2002 17:09:46 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.tcl 21 Jun 2002 19:08:33 -0000 1.3 @@ -4,13 +4,14 @@ @author Bryan Quinn (bquinn@arsdigita.com) @creation-date Mon Oct 23 14:58:57 2000 - @cvs-id $Id$ + @version $Id$ + } { package_id:naturalnum } -validate { package_not_mounted_ck { if {[db_string package_mounted_p { - select decode(count(*),0, 0, 1) + select decode(count(*),0, 0, 1) from apm_packages p, site_nodes s where package_id = :package_id and p.package_id = s.object_id @@ -23,11 +24,7 @@ } db_transaction { - db_exec_plsql package_instance_delete { - begin - apm_package.delete(package_id => :package_id); - end; - } + apm_package_instance_delete $package_id } on_error { if {[db_string instance_delete_doubleclick_ck { select decode(count(*), 0, 0, 1) from apm_packages @@ -39,4 +36,3 @@ } ad_returnredirect unmounted - 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/instance-delete.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/instance-delete.xql 21 Jun 2002 19:08:33 -0000 1.2 @@ -1,26 +1,21 @@ - - - - select case when count(*) = 0 then 0 else 1 end + + + 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 - - - + + + 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.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.tcl 21 Jun 2002 19:08:33 -0000 1.2 @@ -14,15 +14,6 @@ ad_require_permission $package_id read -db_transaction { - db_dml mount { - update site_nodes - set object_id = :package_id - where node_id = :node_id - and object_id is null - } +site_node::mount -node_id $node_id -object_id $package_id - site_nodes_sync -} - -ad_returnredirect .?[export_url_vars expand:multiple root_id] +ad_returnredirect ".?[export_url_vars expand:multiple root_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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/mount-2.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ - - - - - - - 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 -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-oracle.xql 21 Jun 2002 19:08:33 -0000 1.2 @@ -1,69 +1,54 @@ - oracle8.1.6 + 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) = 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 + + - - - - - - - - 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 -N -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount-postgresql.xql 21 Jun 2002 19:08:33 -0000 1.3 @@ -1,69 +1,54 @@ - postgresql7.1 + postgresql7.1 - - - - select site_node__url(:node_id) + + + 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) = 0 - and not exists (select 1 - from site_nodes - where object_id = package_id) + + + 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 + + - 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 + + - - - - - - - - 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.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.tcl 21 Jun 2002 19:08:33 -0000 1.2 @@ -15,68 +15,33 @@ doc_body_append "[ad_header "Mount A Package Instance"] -Please select one of the following packages to mount on [db_string url { - select site_node.url(:node_id) from dual -}]. -

+Please select one of the following packages to mount on [site_node::get_url -node_id $node_id]. +

The package instances are not mounted anywhere else:

These instances are already mounted elsewhere. Selecting one of them will create an additional location for the same application:
    " -db_foreach packages_mounted_select { - 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 -} { +db_foreach packages_mounted_select {} { doc_body_append "
  • $name" } -doc_body_append "
+doc_body_append " The packages are centralized services and are -probably not meant to be mounted anywhere: +probably not meant to be mounted anywhere:
    " -db_foreach packages_singleton_select { - 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 -} { +db_foreach packages_singleton_select {} { doc_body_append "
  • $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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/new-oracle.xql 30 Apr 2001 20:11:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ - - - - 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 -N --- openacs-4/packages/acs-subsite/www/admin/site-map/new-postgresql.xql 30 Apr 2001 20:11:24 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ - - - - postgresql7.1 - - - - - select site_node__new ( - :new_node_id, - :parent_id, - :name, - null, - :directory_p, - :pattern_p, - :user_id, - :ip_address - ) - - - - - - Index: openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 13 Mar 2001 22:59:26 -0000 1.1 +++ openacs-4/packages/acs-subsite/www/admin/site-map/new.tcl 21 Jun 2002 19:08:33 -0000 1.2 @@ -1,53 +1,41 @@ ad_page_contract { - @author Rafael Schloming (rhs@mit.edu) - @creation-date 2000-09-09 - @cvs-id $Id$ + @author Rafael Schloming (rhs@mit.edu) + @creation-date 2000-09-09 + @version $Id$ } { - new_node_id:naturalnum - parent_id:integer,notnull - name:notnull - node_type:notnull - {expand:integer,multiple {}} - {root_id:integer {}} + parent_id:integer,notnull + name:notnull + node_type:notnull + {expand:integer,multiple {}} + {root_id:integer {}} } -validate { - name_root_ck -requires name:notnull { - if {[string match "*/*" $name]} { - ad_complain + name_root_ck -requires name:notnull { + if {[string match "*/*" $name]} { + ad_complain + } } - } - - name_duplicate_ck -requires name_root_ck { - if { [db_string site_node_duplicate_name_root_ck { - select decode(count(*), 0, 0, 1) - from site_nodes - where name = :name - and parent_id = :parent_id - and node_id <> :new_node_id - } -default 0]} { - ad_complain - } - } - - node_type_ck -requires node_type:notnull { - switch $node_type { - folder { - set directory_p t - set pattern_p t - } - - file { - set directory_p f - set pattern_p f - } - - default { - ad_complain - } - } - } - + name_duplicate_ck -requires name_root_ck { + if { [db_string site_node_duplicate_name_root_ck {} -default 0]} { + ad_complain + } + } + node_type_ck -requires node_type:notnull { + switch $node_type { + folder { + set directory_p t + set pattern_p t + } + file { + set directory_p f + set pattern_p f + } + default { + ad_complain + } + } + } } -errors { name_root_ck {Folder or file names cannot contain '/'} name_duplicate_ck {The URL mapping you are creating is already in use. Please delete the other one or change your URL.} @@ -58,25 +46,14 @@ set ip_address [ad_conn peeraddr] db_transaction { - set node_id [db_exec_plsql node_new { - 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; - }] + set node_id [site_node::new \ + -name $name \ + -parent_id $parent_id \ + -directory_p $directory_p \ + -pattern_p $pattern_p \ + ] } on_error { - if {![db_string site_node_new_doubleclick_protect { - select decode(count(*), 0, 0, 1) - from site_nodes - where node_id = :new_node_id - } -default 0]} { + if {![db_string site_node_new_doubleclick_protect {} -default 0]} { ad_return_complaint "Error Creating Site Node" "The following error was generated when attempting to create the site node: 
    @@ -86,7 +63,7 @@
 }
 
 if {[lsearch $expand $parent_id] == -1} {
-  lappend expand $parent_id
+    lappend expand $parent_id
 }
 
-ad_returnredirect .?[export_url_vars expand:multiple root_id]
+ad_returnredirect ".?[export_url_vars expand:multiple root_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 -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/new.xql	30 Apr 2001 20:11:24 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/new.xql	21 Jun 2002 19:08:33 -0000	1.2
@@ -1,28 +1,21 @@
 
 
 
-      
-      
-      
-          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 name = :name
+            and parent_id = :parent_id
+        
+    
 
- 
-      
-      
-      
-        select case when count(*) = 0 then 0 else 1 end 
-        from site_nodes
-        where node_id = :new_node_id
-    
+    
+        
+            select case when count(*) = 0 then 0 else 1 end
+            from site_nodes
+            where node_id = :node_id
       
-
+    
 
- 
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/package-new-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/package-new-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new-postgresql.xql	22 Apr 2001 16:13:15 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-
-
-postgresql7.1
-
-
-  
-	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/package-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.tcl	21 Jun 2002 19:08:33 -0000	1.2
@@ -2,28 +2,25 @@
 
 ad_page_contract {
 
-  @author rhs@mit.edu
-  @creation-date 2000-09-13
-  @cvs-id $Id$
+    @author rhs@mit.edu
+    @creation-date 2000-09-13
+    @version $Id$
+
 } {
-  new_package_id:naturalnum
-  node_id:integer,notnull
-  instance_name:notnull
-  package_key:notnull
-  {expand:integer,multiple {}}
-  root_id:integer,optional
+    new_package_id:integer,notnull
+    node_id:integer,notnull
+    instance_name:notnull
+    package_key:notnull
+    {expand:integer,multiple ""}
+    root_id:integer,optional
 }
 
 set context_id [ad_conn package_id]
 
 db_transaction {
-  set package_id [site_node_create_package_instance -package_id $new_package_id $node_id $instance_name $context_id $package_key]
+    set package_id [site_node_create_package_instance -package_id $new_package_id $node_id $instance_name $context_id $package_key]
 } on_error {
-    if {![db_string package_new_doubleclick_ck {
-	select decode(count(*), 0, 0, 1) 
- 	from apm_packages
-	where package_id = :new_package_id
-    } -default 0]} {
+    if {![db_string package_new_doubleclick_ck {} -default 0]} {
 	ad_return_complaint "Error Creating Package" "The following error was generated
 		when attempting to create the package
 	
    @@ -32,4 +29,4 @@
     }
 }
 
-ad_returnredirect .?[export_url_vars expand:multiple root_id]
+ad_returnredirect ".?[export_url_vars expand:multiple root_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 -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/package-new.xql	30 Apr 2001 20:11:24 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/package-new.xql	21 Jun 2002 19:08:33 -0000	1.2
@@ -1,15 +1,13 @@
 
+
 
 
-      
-      
-      
-	select case when count(*) = 0 then 0 else 1 end 
- 	from apm_packages
-	where package_id = :new_package_id
-    
-      
-
+    
+        
+            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.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.tcl	21 Jun 2002 19:08:33 -0000	1.2
@@ -1,8 +1,11 @@
 ad_page_contract {
+
     Set parameters on a package instance.
+
     @author Bryan Quinn (bquinn@arsdigita.com)
     @date 12 September 2000
-    @cvs-id $Id$
+    @version $Id$
+
 } {
     package_key:notnull
     package_id:naturalnum,notnull
@@ -12,14 +15,8 @@
 
 ad_require_permission $package_id admin
 
-ns_log Notice "[array names params]"
-
 if { [catch {
-    db_foreach apm_parameters_set {
-	select parameter_id, parameter_name
-	from apm_parameters
-	where package_key = :package_key
-    } {
+    db_foreach apm_parameters_set {} {
 	if {[info exists params($parameter_id)]} {
 	    ad_parameter -set $params($parameter_id) -package_id $package_id $parameter_name $package_key 
 	}
@@ -29,4 +26,4 @@
 
    [ad_quotehtml $errmsg]
    ."
 } else {
     ad_returnredirect index
-}
\ No newline at end of file
+}
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 -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.xql	30 Apr 2001 20:11:24 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-2.xql	21 Jun 2002 19:08:33 -0000	1.2
@@ -1,15 +1,14 @@
 
+
 
 
-      
-      
-      
-	select parameter_id, parameter_name
-	from apm_parameters
-	where package_key = :package_key
-    
-      
-
+    
+        
+            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 -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql	20 Nov 2001 17:46:28 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-oracle.xql	21 Jun 2002 19:08:33 -0000	1.5
@@ -1,35 +1,34 @@
 
 
 
-   oracle8.1.6
+    oracle8.1.6
 
-      
-      
-      
-    select package_key, acs_object.name(package_id) instance_name
-    from apm_packages
-    where package_id = :package_id
+    
+        
+            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,
+                   p.package_key,
+                   nvl(p.description, 'No Description') description,
+                   v.attr_value,
+                   nvl(p.section_name, 'No Section Name') section_name
+            from apm_parameters p,
+                 (select v.parameter_id,
+                         v.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)
+            $additional_sql
+        
+    
 
- 
-      
-      
-
-select p.parameter_id, p.parameter_name, p.package_key,
-       nvl(p.description, 'No Description') description,
-       v.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)
-$additional_sql
-
-      
-
-
- 
 
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 -N -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql	20 Nov 2001 17:46:28 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set-postgresql.xql	21 Jun 2002 19:08:33 -0000	1.7
@@ -1,35 +1,34 @@
 
 
 
-   postgresql7.1
+    postgresql7.1
 
-      
-      
-      
-    select package_key, acs_object__name(package_id) as instance_name
-    from apm_packages
-    where package_id = :package_id
+    
+        
+            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,
+                   p.package_key,
+                   coalesce(p.description, 'No Description') as description,
+                   v.attr_value,
+                   coalesce(p.section_name, 'No Section Name') as section_name
+            from apm_parameters p left outer join
+                 (select v.parameter_id,
+                         v.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)
+            $additional_sql
+        
+    
 
- 
-      
-      
-
-select p.parameter_id, p.parameter_name, p.package_key,
-       coalesce(p.description, 'No Description') as description,
-       v.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)
-$additional_sql
-
-      
-
-
- 
 
Index: openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/Attic/parameter-set.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	20 Nov 2001 17:46:28 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/parameter-set.tcl	21 Jun 2002 19:08:33 -0000	1.5
@@ -1,20 +1,20 @@
 ad_page_contract {
+
     Set parameters on a package instance.
+
     @author Bryan Quinn (bquinn@arsdigita.com)
     @date 12 September 2000
-    @cvs-id $Id$
+    @version $Id$
+
 } {
     package_id:naturalnum,notnull
     {orderby ""}
 }
 
 ad_require_permission $package_id admin
-db_1row package_info {
-    select package_key, acs_object.name(package_id) instance_name
-    from apm_packages
-    where package_id = :package_id
-}
 
+db_1row package_info {}
+
 set table_def [list \
 		   [list parameter_name "Parameter Name"] \
 		   [list description "Description"]]
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmount.tcl	21 Jun 2002 19:08:33 -0000	1.2
@@ -2,23 +2,16 @@
 
 ad_page_contract {
 
-  @author rhs@mit.edu
-  @creation-date 2000-09-12
-  @cvs-id $Id$
+    @author rhs@mit.edu
+    @creation-date 2000-09-12
+    @version $Id$
+
 } {
-  node_id:integer,notnull
-  {expand:integer,multiple {}}
-  root_id:integer,optional
+    node_id:integer,notnull
+    {expand:integer,multiple ""}
+    root_id:integer,optional
 }
 
-db_transaction {
-  db_dml unmount {
-    update site_nodes
-    set object_id = null
-    where node_id = :node_id
-  }
+site_node::unmount -node_id $node_id
 
-  site_nodes_sync
-}
-
-ad_returnredirect .?[export_url_vars expand:multiple root_id]
+ad_returnredirect ".?[export_url_vars expand:multiple root_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 -N
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmount.xql	30 Apr 2001 20:11:24 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-
-
-
-      
-      
-      
-    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/unmounted-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-oracle.xql	30 Apr 2001 20:11:24 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-oracle.xql	21 Jun 2002 19:08:33 -0000	1.2
@@ -1,42 +1,34 @@
 
 
 
-   oracle8.1.6
+    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) = 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
+        
+    
 
- 
-      
-      
-      
-  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/unmounted-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql	30 Apr 2001 20:11:24 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted-postgresql.xql	21 Jun 2002 19:08:33 -0000	1.3
@@ -1,42 +1,34 @@
 
 
 
-   postgresql7.1
+    postgresql7.1
 
-      
-      
-      
-  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) = 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
+        
+    
 
- 
-      
-      
-      
-  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.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.tcl	21 Jun 2002 19:08:33 -0000	1.2
@@ -2,10 +2,10 @@
 
     Display all readable unmounted packages
 
-  @author bquinn@arsdigita.com
-  @creation-date 2000-09-12
-  @cvs-id $Id$
-} {
+    @author bquinn@arsdigita.com
+    @creation-date 2000-09-12
+    @version $Id$
+
 }
 
 doc_body_append "[ad_header "Unmounted Packages"]
@@ -20,18 +20,7 @@
 
 set user_id [ad_conn user_id]
 
-db_foreach packages_normal_select {
-  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
-} {
+db_foreach packages_normal_select {} {
     doc_body_append "
  • $name \[delete\]"
 }
 
@@ -42,18 +31,7 @@
 
 
      "
 
-db_foreach packages_singleton_select {
-  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
-} {
+db_foreach packages_singleton_select {} {
     doc_body_append "
    • $name \[delete\]"
 }