Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 15 Sep 2002 22:10:50 -0000 1.17 +++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl 16 Jan 2003 13:41:57 -0000 1.18 @@ -112,6 +112,9 @@ returns an array representing the site node that matches the given url either url or node_id is required, if both are passed url is ignored + + The array elements are: package_id, package_key, object_type, directory_p, + instance_namem, pattern_p, parent_id, node_id, object_id, url. } { if {[empty_string_p $url] && [empty_string_p $node_id]} { error "site_node::get \"must pass in either url or node_id\"" @@ -131,6 +134,8 @@ {-node_id:required} } { returns an array representing the site node for the given node_id + + @see site_node::get } { return [get_from_url -url [get_url -node_id $node_id]] } @@ -139,6 +144,8 @@ {-url:required} } { returns an array representing the site node that matches the given url + + @see site_node::get } { # attempt an exact match if {[nsv_exists site_nodes $url]} { @@ -332,9 +339,9 @@ {-sync_p "t"} {-return "package_id"} parent_node_id - instance_name + url_path_component package_key - package_name + instance_name } { Creates a new instance of the specified package and mounts it beneath parent_node_id. @@ -343,17 +350,16 @@ @creation-date 2001-02-05 @param sync_p If "t", we flush the in-memory site map - @param return You can specify what is returned: the package_id or node_id - (now ignored, always return package_id) + @param return (now ignored, always return package_id) @param parent_node_id The node under which we are mounting this application - @param instance_name The instance name for the new site node + @param url_path_component the url for the mounted instance (appended to the parent_node + url) @param package_key The type of package we are mounting - @param package_name The name we want to give the package we are - mounting. - @return The package id of the newly mounted package or the new - node id, based on the value of $return + @param instance_name The name we want to give the package we are + mounting (used for the context bar string etc). + @return The package id of the newly mounted package } { # if there is an object mounted at the parent_node_id then use that # object_id, instead of the parent_node_id, as the context_id @@ -365,11 +371,11 @@ } return [site_node_apm_integration::new_site_node_and_package \ - -name $instance_name \ - -parent_id $parent_node_id \ - -package_key $package_key \ - -instance_name $package_name \ - -context_id $context_id \ + -name $url_path_component \ + -parent_id $parent_node_id \ + -package_key $package_key \ + -instance_name $instance_name \ + -context_id $context_id \ ] }