Index: openacs-4/packages/general-comments/tcl/general-comments-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs-oracle.xql,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs-oracle.xql	29 Sep 2003 17:45:48 -0000	1.4
+++ openacs-4/packages/general-comments/tcl/general-comments-procs-oracle.xql	22 Mar 2004 02:54:57 -0000	1.4.4.1
@@ -26,29 +26,6 @@
 </fullquery>
 
  
-<fullquery name="general_comments_package_url_not_cached.get_package_url">      
-      <querytext>
-      
-             select site_node.url(s.node_id) as package_url
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    lower(a.package_key) = 'general-comments' and
-                    RowNum = 1
-      </querytext>
-</fullquery>
-
- 
-<fullquery name="get_comments.get_package_url_deprecated">      
-      <querytext>
-      
-             select site_node.url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="get_comments.get_comments_deprecated">      
       <querytext>
       
@@ -74,17 +51,6 @@
 </fullquery>
 
  
-<fullquery name="get_comments.get_package_url_deprecated">      
-      <querytext>
-      
-             select site_node.url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'
-      </querytext>
-</fullquery>
-
-
 <fullquery name="general_comment_new.insert_comment">      
       <querytext>
       
Index: openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql	29 Sep 2003 17:45:48 -0000	1.4
+++ openacs-4/packages/general-comments/tcl/general-comments-procs-postgresql.xql	22 Mar 2004 02:54:57 -0000	1.4.4.1
@@ -26,29 +26,8 @@
 </fullquery>
 
  
-<fullquery name="general_comments_package_url_not_cached.get_package_url">      
-      <querytext>
-      
-             select site_node__url(s.node_id) as package_url
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    lower(a.package_key) = 'general-comments'
-                    LIMIT 1
-      </querytext>
-</fullquery>
 
  
-<fullquery name="get_comments.get_package_url_deprecated">      
-      <querytext>
-      
-             select site_node__url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'
-      </querytext>
-</fullquery>
-
- 
 <fullquery name="get_comments.get_comments_deprecated">      
       <querytext>
       
@@ -74,15 +53,6 @@
 </fullquery>
 
  
-<fullquery name="get_comments.get_package_url_deprecated">      
-      <querytext>
-      
-             select site_node__url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'
-      </querytext>
-</fullquery>
 
 <fullquery name="general_comment_new.insert_comment">      
       <querytext>
Index: openacs-4/packages/general-comments/tcl/general-comments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/tcl/general-comments-procs.tcl,v
diff -u -N -r1.12 -r1.12.2.1
--- openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	25 Feb 2004 10:40:46 -0000	1.12
+++ openacs-4/packages/general-comments/tcl/general-comments-procs.tcl	22 Mar 2004 02:54:57 -0000	1.12.2.1
@@ -238,27 +238,13 @@
     return $html
 }
 
-ad_proc -private general_comments_package_url {} {
+ad_proc -public general_comments_package_url {} {
     Returns a url pointing to the mounted general-comments package.
     Uses util_memoize for caching.
 } {
-    return [util_memoize [list general_comments_package_url_not_cached]]
+    return [site_node::get_package_url -package_key "general-comments"]
 }
 
-ad_proc -private general_comments_package_url_not_cached {} {
-    Returns a url pointing to the mounted general-comments package.
-    Goes to the database on every invocation.
-} {
-    
-    if { [db_0or1row get_package_url "" ] } {
-        return $package_url
-    } else {
-        # log an error message
-        ns_log Notice "general_comments_package_url_not_cached: the General Comments package is not mounted."
-        return ""
-    }
-}
-
 # these are being replaced with the above procs
 namespace eval general_comments {
 
@@ -272,11 +258,7 @@
 } {
 
     # get the package url
-     set package_url [db_string get_package_url_deprecated "
-             select site_node.url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'"]
+    set package_url [general_comments_package_url]
 
     set html ""
     db_foreach get_comments_deprecated "
@@ -314,11 +296,7 @@
     @see general_comments_create_link
 } {
     # get the package url
-    set package_url [db_string get_package_url_deprecated "
-             select site_node.url(s.node_id)
-               from site_nodes s, apm_packages a
-              where s.object_id = a.package_id and
-                    a.package_key = 'general-comments'"]
+    set package_url [general_comments_package_url]
 
     set html "<a href=\"${package_url}comment-add?[export_url_vars object_id object_name return_url context_id category]\">$link_text</a>"
     return $html