Index: openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql,v
diff -u -N -r1.15 -r1.16
--- openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql	11 Apr 2002 02:36:04 -0000	1.15
+++ openacs-4/packages/dotlrn/tcl/community-procs-oracle.xql	18 Apr 2002 17:36:01 -0000	1.16
@@ -3,7 +3,7 @@
 <queryset>
   <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-    <fullquery name="dotlrn_community::get_community_id_memoized.select_community">
+    <fullquery name="dotlrn_community::get_community_id_not_cached.select_community">
         <querytext>
             select dotlrn_communities.community_id
             from dotlrn_communities,
@@ -73,7 +73,7 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_community::get_url_from_package_id_memoized.select_node_url">
+    <fullquery name="dotlrn_community::get_url_from_package_id_not_cached.select_node_url">
         <querytext>
             select site_node.url(node_id)
             from site_nodes
Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -N -r1.105 -r1.106
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	17 Apr 2002 20:44:18 -0000	1.105
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	18 Apr 2002 17:36:01 -0000	1.106
@@ -399,10 +399,10 @@
     } {
         This gets the relative URL for a package_id.
     } {
-        return [util_memoize "dotlrn_community::get_url_from_package_id_memoized -package_id $package_id"]
+        return [util_memoize "dotlrn_community::get_url_from_package_id_not_cached -package_id $package_id"]
     }
 
-    ad_proc -private get_url_from_package_id_memoized {
+    ad_proc -private get_url_from_package_id_not_cached {
         {-package_id ""}
     } {
         Memoizing helper
@@ -852,10 +852,10 @@
     } {
         returns the community type from community_id
     } {
-        return [util_memoize "dotlrn_community::get_community_type_from_community_id_memoized -community_id $community_id"]
+        return [util_memoize "dotlrn_community::get_community_type_from_community_id_not_cached -community_id $community_id"]
     }
 
-    ad_proc -private get_community_type_from_community_id_memoized {
+    ad_proc -private get_community_type_from_community_id_not_cached {
         {-community_id:required}
     } {
         returns the community type from community_id
@@ -868,10 +868,10 @@
         Returns the community type key depending on the node we're at
     } {
         set package_id [ad_conn package_id]
-        return [util_memoize "dotlrn_community::get_community_type_memoized -package_id $package_id"]
+        return [util_memoize "dotlrn_community::get_community_type_not_cached -package_id $package_id"]
     }
 
-    ad_proc -private get_community_type_memoized {
+    ad_proc -private get_community_type_not_cached {
         {-package_id:required}
     } {
         Returns the community type key depending on the node we're at
@@ -903,10 +903,10 @@
             set package_id [ad_conn package_id]
         }
 
-        return [util_memoize "dotlrn_community::get_community_id_memoized -package_id $package_id"]
+        return [util_memoize "dotlrn_community::get_community_id_not_cached -package_id $package_id"]
     }
 
-    ad_proc -private get_community_id_memoized {
+    ad_proc -private get_community_id_not_cached {
         {-package_id:required}
     } {
         Returns the community id depending on the package_id
@@ -927,10 +927,10 @@
             set package_id [ad_conn package_id]
         }
 
-        return [util_memoize "dotlrn_community::get_parent_community_id_memoized -package_id $package_id"]
+        return [util_memoize "dotlrn_community::get_parent_community_id_not_cached -package_id $package_id"]
     }
 
-    ad_proc -private get_parent_community_id_memoized {
+    ad_proc -private get_parent_community_id_not_cached {
         {-package_id:required}
     } {
         Returns the community_id of our parent node or the parent
@@ -951,10 +951,10 @@
         Returns the parent community's id or null
     } {
         return [util_memoize \
-                "dotlrn_community::get_parent_id_memoized -community_id $community_id"]
+                "dotlrn_community::get_parent_id_not_cached -community_id $community_id"]
     }
 
-    ad_proc -private get_parent_id_memoized {
+    ad_proc -private get_parent_id_not_cached {
         {-community_id:required}
     } {
         Returns the parent community's id or null
@@ -1009,10 +1009,10 @@
     } {
         Returns 1 if the community has a subcommunity, memoized for 1 min
     } {
-        return [util_memoize "dotlrn_community::has_subcommunity_p_memoized -community_id $community_id" 60]        
+        return [util_memoize "dotlrn_community::has_subcommunity_p_not_cached -community_id $community_id" 60]        
     }
 
-    ad_proc -private has_subcommunity_p_memoized {
+    ad_proc -private has_subcommunity_p_not_cached {
         {-community_id:required}
     } {
         Returns 1 if the community has a subcommunity
@@ -1248,10 +1248,10 @@
     } {
         get the name for a community
     } {
-        return [util_memoize "dotlrn_community::get_community_name_memoized $community_id"]
+        return [util_memoize "dotlrn_community::get_community_name_not_cached $community_id"]
     }
 
-    ad_proc -private get_community_name_memoized {
+    ad_proc -private get_community_name_not_cached {
         community_id
     } {
         memo helper
@@ -1321,10 +1321,10 @@
             set community_id [get_community_id]
         }
 
-        return [util_memoize "dotlrn_community::get_portal_template_id_memoized -community_id $community_id"]
+        return [util_memoize "dotlrn_community::get_portal_template_id_not_cached -community_id $community_id"]
     }
 
-    ad_proc -private get_portal_template_id_memoized {
+    ad_proc -private get_portal_template_id_not_cached {
         {-community_id:required}
     } {
         get the id of the portal template for a community
Index: openacs-4/packages/dotlrn/tcl/community-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.xql,v
diff -u -N -r1.50 -r1.51
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	16 Apr 2002 13:53:52 -0000	1.50
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	18 Apr 2002 17:36:01 -0000	1.51
@@ -46,7 +46,7 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::get_parent_id_memoized.select_parent_id">
+<fullquery name="dotlrn_community::get_parent_id_not_cached.select_parent_id">
 <querytext>
 select dotlrn_communities.parent_community_id
 from dotlrn_communities
@@ -250,19 +250,19 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::get_community_type_memoized.select_community_type">
+<fullquery name="dotlrn_community::get_community_type_not_cached.select_community_type">
 <querytext>
 select community_type from dotlrn_community_types where package_id= :package_id
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::get_community_type_from_community_id_memoized.select_community_type">
+<fullquery name="dotlrn_community::get_community_type_from_community_id_not_cached.select_community_type">
 <querytext>
 select community_type from dotlrn_communities where community_id=:community_id
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::has_subcommunity_p_memoized.select_subcomm_check">
+<fullquery name="dotlrn_community::has_subcommunity_p_not_cached.select_subcomm_check">
 <querytext>
 select 1 from dual where exists (select 1 from dotlrn_communities where parent_community_id = :community_id)
 </querytext>
@@ -315,7 +315,7 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::get_community_name_memoized.select_community_name">
+<fullquery name="dotlrn_community::get_community_name_not_cached.select_community_name">
 <querytext>
 select pretty_name from dotlrn_communities where community_id= :community_id
 </querytext>
@@ -351,7 +351,7 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn_community::get_portal_template_id_memoized.select_portal_template_id">
+<fullquery name="dotlrn_community::get_portal_template_id_not_cached.select_portal_template_id">
 <querytext>
 select portal_template_id from dotlrn_communities where community_id= :community_id
 </querytext>
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -N -r1.44 -r1.45
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	18 Apr 2002 04:06:34 -0000	1.44
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	18 Apr 2002 17:36:01 -0000	1.45
@@ -199,10 +199,10 @@
     } {
 	Return the user default theme
     } {
-	return [util_memoize "dotlrn::get_user_theme_memoized $user_id"]
+	return [util_memoize "dotlrn::get_user_theme_not_cached $user_id"]
     }
 
-    ad_proc -private get_user_theme_memoized {
+    ad_proc -private get_user_theme_not_cached {
 	user_id
     } {
 	helper
@@ -224,10 +224,10 @@
     } {
 	Get the workspace page ID for a particular user
     } {
-        return [util_memoize "dotlrn::get_workspace_portal_id_memoized $user_id"]
+        return [util_memoize "dotlrn::get_workspace_portal_id_not_cached $user_id"]
     }
 
-    ad_proc -private get_workspace_portal_id_memoized {
+    ad_proc -private get_workspace_portal_id_not_cached {
 	user_id
     } {
 	Get the workspace page ID for a particular user
@@ -240,10 +240,10 @@
     } {
 	Get the names the the user
     } {
-        return [util_memoize "dotlrn::get_user_name_memoized $user_id"]
+        return [util_memoize "dotlrn::get_user_name_not_cached $user_id"]
     }
 
-    ad_proc -private get_user_name_memoized {
+    ad_proc -private get_user_name_not_cached {
 	user_id
     } {
         helper
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql	5 Apr 2002 01:00:41 -0000	1.13
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql	18 Apr 2002 17:36:01 -0000	1.14
@@ -14,7 +14,7 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn::get_user_theme_memoized.select_user_theme">
+<fullquery name="dotlrn::get_user_theme_not_cached.select_user_theme">
 <querytext>
 select theme_id from dotlrn_full_users where user_id = :user_id
 </querytext>
@@ -26,7 +26,7 @@
 </querytext>
 </fullquery>
 
-<fullquery name="dotlrn::get_workspace_portal_id_memoized.select_user_portal_id">
+<fullquery name="dotlrn::get_workspace_portal_id_not_cached.select_user_portal_id">
 <querytext>
 select portal_id from dotlrn_full_users where user_id= :user_id
 </querytext>
Index: openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/site-nodes-procs.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl	17 Apr 2002 04:30:27 -0000	1.13
+++ openacs-4/packages/dotlrn/tcl/site-nodes-procs.tcl	18 Apr 2002 17:36:01 -0000	1.14
@@ -109,10 +109,10 @@
     } {
         get the name of the parent of this instance
     } {
-        return [util_memoize "site_nodes::get_parent_name_memoized -instance_id $instance_id"]
+        return [util_memoize "site_nodes::get_parent_name_not_cached -instance_id $instance_id"]
     }
 
-    ad_proc -public get_parent_name_memoized {
+    ad_proc -public get_parent_name_not_cached {
         {-instance_id ""}
     } {
         memoizing helper
Index: openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/Attic/site-nodes-procs.xql,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql	11 Apr 2002 02:36:04 -0000	1.7
+++ openacs-4/packages/dotlrn/tcl/site-nodes-procs.xql	18 Apr 2002 17:36:01 -0000	1.8
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <queryset>
 
-    <fullquery name="site_nodes::get_parent_name_memoized.select_parent_name_by_id">
+    <fullquery name="site_nodes::get_parent_name_not_cached.select_parent_name_by_id">
         <querytext>
             select instance_name
             from apm_packages