Index: openacs-4/packages/cms/www/modules/users/user-assoc.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-assoc.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/user-assoc.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/user-assoc.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,12 +6,12 @@
 set user_id [User::getID]
 set ip [ns_conn peeraddr]
 
-set db [template::begin_db_transaction]
+db_transaction {
 
-if { [template::util::is_nil id] } {
-  set code {
-    if { [catch { 
-      template::query user_assoc_root dml "
+    if { [template::util::is_nil id] } {
+        set code {
+            if { [catch { 
+                db_exec_plsql user_assoc_root "
         declare
           v_id membership_rels.rel_id%TYPE;
           cursor c_rel_cur is
@@ -31,14 +31,14 @@
             membership_rel.delete(v_id);
           end loop;
         end;"
-    } errmsg] } {
-    }
-  }             
-  
-} else {
-  set code {
-    if { [catch { 
-      ns_ora exec_plsql_bind $db "
+            } errmsg] } {
+            }
+        }             
+        
+    } else {
+        set code {
+            if { [catch { 
+                db_exec_plsql user_assoc_root2 "
         declare
           v_group_id groups.group_id%TYPE;
           v_user_id users.user_id%TYPE;
@@ -53,16 +53,15 @@
 
           exception when no_data_found then null;
         end;" [list 1] rel_id
-    } errmsg] } {
+            } errmsg] } {
+            }
+        }   
     }
-  }   
-}
 
-set clip [clipboard::parse_cookie]
+    set clip [clipboard::parse_cookie]
 
-clipboard::map_code $clip $mount_point $code
-template::end_db_transaction
-template::release_db_handle
+    clipboard::map_code $clip $mount_point $code
+}
 
 clipboard::free $clip