Index: openacs-4/packages/cms/www/modules/sitemap/copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/copy.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/copy.tcl	24 May 2001 01:30:52 -0000	1.2
@@ -12,9 +12,6 @@
   set folder_id $id
 }
 
-
-set db [template::get_db_handle]
-
 # permission check - must have cm_new on the current folder
 set user_id [User::getID]
 content::check_access $folder_id cm_new -user_id $user_id 
@@ -29,15 +26,15 @@
     set no_items_on_clipboard "f"
 }
 
-template::query path onevalue "
+template::query get_path path onevalue "
   select
     content_item.get_path( :folder_id )
   from 
     dual
 " 
 
 # get relevant marked items
-template::query marked_items multirow "
+template::query get_marked marked_items multirow "
   select
     content_item.get_title(item_id) title, 
     content_item.get_path(item_id,:root_id) name, 
@@ -51,9 +48,6 @@
     cms_permission.permission_p(item_id, :user_id, 'cm_examine') = 't'
 "
 
-template::release_db_handle
-
-
 form create copy
 element create copy mount_point \
 	-datatype keyword \
@@ -104,17 +98,17 @@
     foreach cp_item_id $copied_items {
 	set parent_id [element get_values copy "parent_id_$cp_item_id"]
 
-	set sql "
+	set sql 
+
+	if { [catch {db_exec_plsql copy_item "
 	    begin
             content_item.copy(
                 item_id          => :cp_item_id,
                 target_folder_id => :folder_id,
 	        creation_user    => :user_id,
 	        creation_ip      => :ip
             ); 
-            end;"
-
-	if { [catch {template::query copy_item dml $sql} errmsg] } {
+            end;"} errmsg] } {
 	    # possibly a duplicate name
 	    ns_log notice "ERROR: copy.tcl - while copying $errmsg"
 	}