Index: openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/project-manager-procs.tcl,v
diff -u -r1.2.2.5 -r1.2.2.6
--- openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	9 Sep 2004 23:58:21 -0000	1.2.2.5
+++ openacs-4/contrib/packages/project-manager/tcl/project-manager-procs.tcl	16 Sep 2004 18:25:36 -0000	1.2.2.6
@@ -541,3 +541,44 @@
 }
 
 
+ad_proc -public pm::util::package_id {
+} {
+    Returns the package ID for the project manager.
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-09-16
+    
+    @return 
+    
+    @error 
+} {
+    return [db_string get_package_id {
+        SELECT 
+        package_id 
+        FROM
+        cr_folders
+        WHERE
+        description = 'Project Repository'
+        LIMIT 1
+    }]
+}
+
+
+ad_proc -public pm::util::url {
+} {
+    Returns the URL of where the project manager is located,
+    fully qualified
+    
+    @author Jade Rubick (jader@bread.com)
+    @creation-date 2004-09-16
+    
+    @return 
+    
+    @error 
+} {
+    set package_id [pm::util::package_id]
+
+    set package_url "[ad_url][site_node::get_url_from_object_id -object_id $package_id]"
+
+    return $package_url
+}
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs-postgresql.xql,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql	2 Jul 2004 23:13:49 -0000	1.4.2.2
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs-postgresql.xql	16 Sep 2004 18:25:36 -0000	1.4.2.3
@@ -66,14 +66,6 @@
     </querytext>
   </fullquery>
 
-  <fullquery name="pm::task::get_url.get_package_id">
-    <querytext>
-      obviously broken
-      select package_id from surveys
-      where survey_id=:object_id
-    </querytext>
-  </fullquery>
-  
   <fullquery name="pm::task::options_list.get_dependency_tasks">
     <querytext>
       SELECT
Index: openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/tcl/Attic/task-procs.tcl,v
diff -u -r1.4.2.19 -r1.4.2.20
--- openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	15 Sep 2004 23:05:51 -0000	1.4.2.19
+++ openacs-4/contrib/packages/project-manager/tcl/task-procs.tcl	16 Sep 2004 18:25:36 -0000	1.4.2.20
@@ -629,12 +629,12 @@
 ad_proc -public pm::task::get_url {
     object_id
 } {
-    # set package_id [db_string get_package_id {}]
-    # set package_url [site_node::get_url_from_object_id -object_id $package_id]
-    set package_url [site_node::get_url_from_object_id -object_id $object_id]
-    #return "${package_url}task-one?task_id=$object_id"
+    set url [pm::util::url]
+
+    set package_url "${url}task-one?task_id=$object_id"
+
     return $package_url
-    # "/project-manager/task-one?task_id=$object_id"
+
 }
 
 
@@ -939,9 +939,7 @@
 
         set from_address [db_string get_from_email "select email from parties where party_id = :user_id" -default "nobody@nowhere.com"]
 
-        # I think this ad_conn package_url is incorrect. If called
-        # from logger, it will return where logger is mounted. 
-        set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id"
+        set task_url [pm::task::get_url $task_item_id]
 
         set subject "Task Reopened (was $status_description): $task_title"
 
@@ -1121,7 +1119,7 @@
 
         append work_log "</table>"
 
-        set task_url "[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][ad_conn package_url]task-one?task_id=$task_item_id"
+        set task_url [pm::task::get_url $task_item_id]
 
         set subject "Task Closed (was $status_description) $task_title"