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 -r1.215 -r1.216
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	14 Nov 2017 16:12:38 -0000	1.215
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	14 Nov 2017 17:03:24 -0000	1.216
@@ -152,15 +152,19 @@
     } {
         get the node ID of a community type
     } {
-        return [db_string select_node_id {}]
+        set package_id [dotlrn_community::get_type_package_id $community_type]
+        array set node [site_node::get_from_object_id -object_id $package_id]
+        return $node(node_id)
     }
 
     ad_proc -public get_community_node_id {
         community_id
     } {
         get the node ID of a community
     } {
-        return [db_string select_node_id {}]
+        set package_id [dotlrn_community::get_package_id $community_id]
+        array set node [site_node::get_from_object_id -object_id $package_id]
+        return $node(node_id)
     }
 
     ad_proc -public new {
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 -r1.96 -r1.97
--- openacs-4/packages/dotlrn/tcl/community-procs.xql	14 Nov 2017 16:43:24 -0000	1.96
+++ openacs-4/packages/dotlrn/tcl/community-procs.xql	14 Nov 2017 17:03:24 -0000	1.97
@@ -61,26 +61,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn_community::get_type_node_id.select_node_id">
-        <querytext>
-            select node_id
-            from site_nodes
-            where object_id = (select package_id
-                               from dotlrn_community_types
-                               where community_type = :community_type)
-        </querytext>
-    </fullquery>
-
-    <fullquery name="dotlrn_community::get_community_node_id.select_node_id">
-        <querytext>
-            select node_id
-            from site_nodes
-            where object_id = (select package_id
-                               from dotlrn_communities
-                               where community_id = :community_id)
-        </querytext>
-    </fullquery>
-
     <fullquery name="dotlrn_community::new.update_portal_ids">
         <querytext>
             update dotlrn_communities_all