Index: openacs-4/packages/dotlrn/tcl/applets-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/applets-procs.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn/tcl/applets-procs.tcl	23 Oct 2002 12:38:38 -0000	1.18
+++ openacs-4/packages/dotlrn/tcl/applets-procs.tcl	3 Oct 2003 17:37:58 -0000	1.19
@@ -89,10 +89,6 @@
             set url $package_key
         }
 
-        if {[empty_string_p $pretty_name]} {
-            set pretty_name $package_key
-        }
-
         set parent_node_id [site_node::get_node_id -url [get_url]]
 
         set package_id [dotlrn::mount_package \
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 -r1.70 -r1.71
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	29 May 2003 18:05:01 -0000	1.70
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	3 Oct 2003 17:37:58 -0000	1.71
@@ -139,11 +139,11 @@
 
             ns_log notice "dotlrn::mount_package: [array get parent_node]"
 
-            set package_id [site_node_apm_integration::new_site_node_and_package \
-                -name $url \
-                -parent_id $parent_node_id \
+            set package_id [site_node::instantiate_and_mount \
+                -node_name $url \
+                -parent_node_id $parent_node_id \
                 -package_key $package_key \
-                -instance_name $pretty_name \
+                -package_name $pretty_name \
                 -context_id $parent_package_id \
             ]
         }
@@ -262,13 +262,12 @@
 	# We only take the first node right now
 	# FIXME: in case of multi-mounting, which is doubtful, but possible
 	# we have a problem here.
-	set parent_node_id [db_string select_node_id {}]
+	set parent_node_id [site_node::get_node_id -url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0]]
 
-        set new_package_id [site_node_apm_integration::new_site_node_and_package \
-            -name $mount_point \
-            -parent_id $parent_node_id \
+        set new_package_id [site_node::instantiate_and_mount \
+            -node_name $mount_point \
+            -parent_node_id $parent_node_id \
             -package_key $package_key \
-            -instance_name $package_key \
             -context_id $package_id \
         ]
 
@@ -390,7 +389,7 @@
         # a connection put it here. This needs to be a vaild
         # grantee for the perms
         set user_id -1        
-
+        
         set portal_id [portal::create \
             -name "$pretty_name Portal" \
             -csv_list $csv_list \
@@ -416,4 +415,3 @@
     }
 
 }
-
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 -r1.16 -r1.17
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql	24 May 2002 01:58:45 -0000	1.16
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.xql	3 Oct 2003 17:37:58 -0000	1.17
@@ -36,14 +36,6 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="dotlrn::instantiate_and_mount.select_node_id">
-        <querytext>
-            select node_id
-            from site_nodes
-            where object_id = :package_id
-        </querytext>
-    </fullquery>
-
     <fullquery name="dotlrn::get_group_id_from_user_type.select_group_id_from_user_type">
         <querytext>
             select dotlrn_user_types.group_id