Index: openacs-4/packages/logger/tcl/util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/util-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/tcl/util-procs.tcl 3 Jun 2004 21:08:24 -0000 1.4 +++ openacs-4/packages/logger/tcl/util-procs.tcl 10 Jun 2005 20:14:40 -0000 1.5 @@ -80,7 +80,6 @@ set package_id [ad_conn package_id] return [util_memoize "logger::util::project_manager_url_cached -package_id $package_id"] - } @@ -99,41 +98,9 @@ @error empty string if project manager is not installed } { - set package_url [ad_conn package_url] + set pm_package_id [lindex [application_link::get_linked -from_package_id $package_id -to_package_key "project-manager"] 0] + return [lindex [site_node::get_url_from_object_id -object_id $pm_package_id] 0] - # assumes that these return in the same order! - set possible_packages [site_node::get_children -all -package_key project-manager -node_id [site_node::get_node_id -url "/"] -element package_id] - set possible_urls [site_node::get_children -all -package_key project-manager -node_id [site_node::get_node_id -url "/"]] - - set return_url "" - - # we go through the list of project-manager URLs, and check if the - # current package_url is listed as one to be integrated with - # project-manager. If it is, we return the URL to that - # project-manager instance. - - set index 0 - - foreach this_package_id $possible_packages { - - set primary_url [parameter::get \ - -package_id $this_package_id \ - -parameter "LoggerPrimaryURL"] - - if {![empty_string_p $primary_url]} { - - if {[string equal $package_url $primary_url]} { - - set project_manager_url [lindex $possible_urls $index] - - set return_url $project_manager_url - } - } - - incr index - } - - return $return_url }