Index: openacs-4/packages/cms/www/modules/sitemap/symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/symlink.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/symlink.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -15,8 +15,6 @@
     set folder_id $id
 }
 
-
-set db [template::get_db_handle]
 # permission check - must have cm_new on id
 set user_id [User::getID]
 content::check_access $folder_id cm_new -user_id $user_id
@@ -32,7 +30,7 @@
 }
 
 # get title, name, item_id of each marked item
-template::query marked_items multirow "
+template::query get_marked marked_items multirow "
   select
     content_item.get_title(item_id) title, 'symlink_to_' || name as name, 
     item_id
@@ -48,7 +46,6 @@
     cms_permission.permission_p(item_id, :user_id, 'cm_examine') = 't'
 " 
 
-template::release_db_handle
 
 form create symlink
 
@@ -104,16 +101,17 @@
     form get_values symlink id mount_point
     set symlinked_items [element get_values symlink symlinked_items]
 
-    set db [template::begin_db_transaction]
+    db_transaction {
+        foreach sym_item_id $symlinked_items {
+            set element_name_1 "name_$sym_item_id"
+            set element_name_2 "title_$sym_item_id"
 
-    foreach sym_item_id $symlinked_items {
-	set element_name_1 "name_$sym_item_id"
-	set element_name_2 "title_$sym_item_id"
+            set name [element get_values symlink $element_name_1]
+            set label [lindex [element get_values symlink $element_name_2] 0]
 
-	set name [element get_values symlink $element_name_1]
-	set label [lindex [element get_values symlink $element_name_2] 0]
+            set sql 
 
-	set sql "
+            if { [catch {db_exec_plsql new_link "
 	    begin
             :symlink_id := content_symlink.new(
                 name          => :name, 
@@ -124,19 +122,15 @@
                 creation_user => :user_id, 
                 creation_ip   => :ip
             ); 
-            end;"
+            end;" symlink_id} errmsg] } {
+                # possibly a duplicate name
+                ns_log notice "symlink.tcl - while symlinking $errmsg"
+            }
 
-	if { [catch {ns_ora exec_plsql_bind $db $sql symlink_id} errmsg] } {
-	    # possibly a duplicate name
-	    ns_log notice "symlink.tcl - while symlinking $errmsg"
-	}
+        }
 
     }
 
-
-    template::end_db_transaction
-    template::release_db_handle
-
     clipboard::free $clip