Index: openacs-4/packages/cms/www/modules/categories/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/categories/index.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/categories/index.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -23,7 +23,7 @@
 # Get self
 
 if { ![util::is_nil id] && ![string equal $id _all_] } {
-  template::query info onerow "
+  template::query get_info info onerow "
     select 
       content_keyword.is_leaf(:id) as is_leaf,
       content_keyword.get_heading(:id) as heading,
@@ -48,7 +48,7 @@
 set clip [clipboard::parse_cookie]
 
 # Get children
-template::query items multirow "
+template::query get_items items multirow "
   select
     keyword_id,
     content_keyword.is_leaf(keyword_id) as is_leaf,
@@ -65,7 +65,7 @@
 
 # Get the parent id if it is missing
 if { [util::is_nil parent_id] && ![util::is_nil id] } {
-  template::query parent_id onevalue "
+  template::query get_parent_id parent_id onevalue "
     select
       context_id
     from
Index: openacs-4/packages/cms/www/modules/items/assign-keywords.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/assign-keywords.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/assign-keywords.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -24,24 +24,22 @@
 
 set clip [clipboard::parse_cookie]
 
-set db [template::begin_db_transaction]
-
-clipboard::map_code $clip categories {
-  if { [catch { 
-     ns_ora exec_plsql_bind $db "
+db_transaction {
+    clipboard::map_code $clip categories {
+        if { [catch { 
+            db_exec_plsql item_assign "
         begin 
          :1 := content_keyword.item_assign(
           :root_id, :item_id, null, :user_id, :ip); 
-        end;" [list 1] symlink_id
-     lappend folder_list [list $mount_point $item_id]
+        end;"
+            lappend folder_list [list $mount_point $item_id]
 
-  } errmsg] } {
-  }    
+        } errmsg] } {
+        }    
+    }
+
 }
 
-template::end_db_transaction
-template::release_db_handle
-
 clipboard::free $clip
 
 # Specify a null id so that the entire branch will be refreshed
Index: openacs-4/packages/cms/www/modules/items/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/attributes.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/attributes.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -59,7 +59,7 @@
 
 set content_type $type_info(object_type)
 
-template::query attributes multirow "
+template::query get_attributes attributes multirow "
   select 
     types.pretty_name object_label, 
     types.table_name, 
Index: openacs-4/packages/cms/www/modules/items/create-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-1.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/create-1.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/create-1.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -15,8 +15,6 @@
   set parent_id [cm::modules::${mount_point}::getRootFolderID]
 }
 
-set db [template::get_db_handle]
-
 # permissions check - need cm_new on the parent item
 content::check_access $parent_id cm_new -user_id [User::getID]
 
@@ -28,12 +26,11 @@
 if { [file exists [ns_url2file \
 	"custom/$content_type/create-1.tcl"]] } {
 
-    template::release_db_handle
     template::forward "custom/$content_type/create-1?content_type=$content_type&mount_point=$mount_point&parent_id=$parent_id"
 }
 
 
-template::query content_type_name onevalue "
+template::query get_content_typ_name content_type_name onevalue "
   select
     pretty_name
   from
@@ -42,9 +39,6 @@
     object_type = :content_type
 "
 
-template::release_db_handle
-
-
 if { [template::util::is_nil content_type_name] } {
     template::request::error bad_content_type \
 	    "create-1.tcl - Bad content type - $content_type"
Index: openacs-4/packages/cms/www/modules/items/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/delete.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/delete.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -4,14 +4,13 @@
 request set_param item_id -datatype keyword
 request set_param mount_point -datatype keyword -value sitemap
 
-set db [template::begin_db_transaction]
+db_transaction {
+    # permissions check - must have cm_write permissions on item to delete
+    content::check_access $item_id cm_write -user_id [User::getID]
 
-# permissions check - must have cm_write permissions on item to delete
-content::check_access $item_id cm_write -user_id [User::getID]
-
-# get all the parent_id's of the items being deleted
-#   because we need to flush the paginator cache for each of these folders
-template::query flush_list onelist "
+    # get all the parent_id's of the items being deleted
+    #   because we need to flush the paginator cache for each of these folders
+    template::query flush flush_list onelist "
   select
     parent_id
   from
@@ -20,16 +19,14 @@
     resolved_id = :item_id
 " 
 
-template::query item_delete dml "
+    db_exec_plsql item_delete "
   begin 
     content_item.delete(
       item_id => :item_id
     ); 
   end;" 
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 # flush cache
 set root_id [cm::modules::${mount_point}::getRootFolderID]
 set flushed_list [list]
Index: openacs-4/packages/cms/www/modules/items/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/index.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/index.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -22,10 +22,9 @@
 request set_param mount_point -datatype keyword -optional -value sitemap
 request set_param page -datatype integer -optional -value 1 
 
-set db [template::get_db_handle]
 
 # resolve any symlinks
-query resolved_item_id onevalue "
+template::query get_item_id resolved_item_id onevalue "
   select content_symlink.resolve(:item_id) from dual
 " -cache "symlink_resolve $item_id" -persistent
 
@@ -37,7 +36,7 @@
   -return_url "modules/sitemap/index" 
 
 # query the content_type of the item ID so we can check for a custom info page
-template::query info onerow "
+template::query get_info info onerow "
   select 
     content_type, latest_revision
   from 
@@ -47,7 +46,6 @@
 
 template::util::array_to_vars info
 
-template::release_db_handle
 
 # build the path to the custom interface directory for this content type
 
Index: openacs-4/packages/cms/www/modules/items/publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/publish.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/publish.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -6,7 +6,6 @@
 
 set root_path [ns_info pageroot]
 
-set db [template::begin_db_transaction]
 db_transaction {
 
     template::query get_iteminfo iteminfo onerow "
Index: openacs-4/packages/cms/www/modules/items/relate-items-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -119,30 +119,30 @@
   cms_rel::sort_related_item_order $item_id  
 
 
-  set db [template::begin_db_transaction ]
+  db_transaction { 
 
-  unset row
+      unset row
 
-  for { set i 1 } { $i <= ${rel_attrs:rowcount} } {incr i} {
-    upvar 0 "rel_attrs:$i" row
-    template::util::array_to_vars row
+      for { set i 1 } { $i <= ${rel_attrs:rowcount} } {incr i} {
+          upvar 0 "rel_attrs:$i" row
+          template::util::array_to_vars row
 
-    # Insert the basic data
-    
-    # Insert at the end if no order
-    if { [template::util::is_nil order_n] } {
-      template::query get_order order_n onevalue "
+          # Insert the basic data
+          
+          # Insert at the end if no order
+          if { [template::util::is_nil order_n] } {
+              template::query get_order order_n onevalue "
         select 
 	  NVL(max(order_n) + 1, 1) 
 	from 
 	  cr_item_rels
 	where 
 	  item_id = :item_id
         " 
-    }
+          }
 
-    # Perform the insertion
-    db_exec_plsql "begin 
+          # Perform the insertion
+          db_exec_plsql relate "begin 
       :rel_id := content_item.relate (
           item_id       => :item_id,
           object_id     => :related_id,
@@ -152,19 +152,17 @@
       );
     end;" rel_id
 
-    # Insert any extra attributes
-    if { [llength $elements] > 0 } {
-      set attr_list [template::util::tcl_to_sql_list $elements]
-      ns_log notice "$i : $attr_list"
-      content::insert_element_data $db rel_form_2 $relation_type \
-        [list acs_object cr_item_rel] $rel_id "_$i" \
-        " attribute_name in ($attr_list)"
-    }
+          # Insert any extra attributes
+          if { [llength $elements] > 0 } {
+              set attr_list [template::util::tcl_to_sql_list $elements]
+              ns_log notice "$i : $attr_list"
+              content::insert_element_data $db rel_form_2 $relation_type \
+                  [list acs_object cr_item_rel] $rel_id "_$i" \
+                  " attribute_name in ($attr_list)"
+          }
+      }
   }
 
-  template::end_db_transaction
-  template::release_db_handle
-
   template::forward "index?item_id=$item_id&mount_point=$mount_point"
 }
      
Index: openacs-4/packages/cms/www/modules/items/relate-items.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/relate-items.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/relate-items.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -13,7 +13,7 @@
 ######################## BASIC PHASE: create default elements ###################
 
   # Get the item title and type
-  query item_info onerow "
+  template::query get_item_info item_info onerow "
     select 
       content_item.get_title(i.item_id) as title,
       i.content_type
@@ -39,7 +39,7 @@
   }
 
   # Get all possible relation types
-  query type_options multilist "
+  template::query get_options type_options multilist "
     select 
       lpad(' ', level, '-') || pretty_name as pretty_name, 
       object_type
@@ -167,20 +167,17 @@
     set rel_list [list]
     set source_id $item_id
 
-    set db [template::begin_db_transaction]    
+      db_transaction {
+          clipboard::ui::process_form rel_form {
+              if { $row(checked) } {
 
-    clipboard::ui::process_form rel_form {
-      if { $row(checked) } {
+                  template::util::array_to_vars row
 
-	template::util::array_to_vars row
-
-        lappend rel_list [list $item_id $relation_tag $order_n $relation_type]
+                  lappend rel_list [list $item_id $relation_tag $order_n $relation_type]
+              }
+          }
       }
-    }
 
-    template::end_db_transaction
-    template::release_db_handle
-
     # If no rows are checked, we're done
     if { [llength $rel_list] < 1 } {
       template::forward "index?item_id=$source_id&mount_point=$mount_point"
Index: openacs-4/packages/cms/www/modules/items/status-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/status-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/status-edit.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/status-edit.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -37,7 +37,7 @@
 # always show production
 set options [list [list "Production" production]]
 
-query is_publishable onevalue "
+template::query check_status is_publishable onevalue "
   select content_item.is_publishable( :item_id ) from dual"
 
 set is_live [element get_value publish_status is_live] 
@@ -48,7 +48,7 @@
   lappend options [list "Ready" ready] [list "Live (publishes the item)" live]
 }
 
-query is_published onevalue "
+template::query check_published is_published onevalue "
   select content_item.is_published( :item_id ) from dual"
 
 # show "Expired" only if the item is currently published
@@ -91,7 +91,8 @@
 if { [form is_request publish_status] } {
 
   # Get the current status
-  set query "
+
+  template::query get_info info onerow "
     select
       NVL(publish_status, 'production') as publish_status,
       to_char(NVL(start_when, sysdate), 'YYYY MM DD HH24 MI SS') start_when,
@@ -103,8 +104,6 @@
     and
       i.item_id = r.item_id (+)"
 
-  template::query info onerow $query
-
   form set_values publish_status info
 }
 
@@ -115,22 +114,22 @@
   form get_values publish_status publish_status start_when end_when item_id
 
   set db [template::begin_db_transaction]
+  db_transaction {
+      publish::set_publish_status $db $item_id $publish_status
 
-  publish::set_publish_status $db $item_id $publish_status
+      set start_when [template::util::date get_property sql_date $start_when]
+      set end_when [template::util::date get_property sql_date $end_when]
 
-  set start_when [template::util::date get_property sql_date $start_when]
-  set end_when [template::util::date get_property sql_date $end_when]
-
-  ns_ora dml $db "begin 
+      db_exec_plsql set_release_period "begin 
                     content_item.set_release_period(
                       item_id => :item_id,
                       start_when => $start_when,
                       end_when => $end_when
                     );
                   end;"
 
-  template::end_db_transaction
-
+  }
+ 
   template::forward index?item_id=$item_id
 }
 
Index: openacs-4/packages/cms/www/modules/items/template-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/template-register.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/template-register.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/template-register.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,28 +6,24 @@
 request set_param context -datatype keyword
 
 
-set sql "begin content_item.register_template(
-            item_id     => :item_id,
-            template_id => :template_id,
-            use_context => :context ); 
-         end;"
+db_transaction {
 
-set db [template::begin_db_transaction]
-
-# check to make sure that no template is already registered
-#   to this item in this context
-template::query second_template_p onevalue "
+    # check to make sure that no template is already registered
+    #   to this item in this context
+    template::query second_template_p second_template_p onevalue "
   select count(1) from cr_item_template_map
     where use_context = :context
     and item_id = :item_id"
 
-if { $second_template_p == 0 } {
-  if { [catch { template::query template_register dml $sql } err_msg] } {
-    ns_log notice "template-register.tcl got an error: $err_msg"
-  }
+    if { $second_template_p == 0 } {
+        if { [catch { template::query template_register dml "begin content_item.register_template(
+            item_id     => :item_id,
+            template_id => :template_id,
+            use_context => :context ); 
+         end;"} err_msg] } {
+            ns_log notice "template-register.tcl got an error: $err_msg"
+        }
+    }
 }
 
-template::end_db_transaction
-template::release_db_handle
-
 forward "../items/index?item_id=$item_id&#templates"
Index: openacs-4/packages/cms/www/modules/items/template-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/template-unregister.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/template-unregister.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/template-unregister.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,19 +6,15 @@
 request set_param context -datatype text
 
 
-set sql "begin
+db_transaction {
+    if { [catch { db_exec_plsql template_unregiser "begin
          content_item.unregister_template(
              template_id => :template_id, 
              item_id     => :item_id, 
              use_context => :context ); 
-         end;"
-
-
-set db [template::begin_db_transaction]
-if { [catch { template::query template_unregiser dml $sql } err_msg] } {
-    ns_log notice "template-remove.tcl got an error: $err_msg"
+         end;" } err_msg] } {
+        ns_log notice "template-remove.tcl got an error: $err_msg"
+    }
 }
-template::end_db_transaction
-template::release_db_handle
 
 template::forward "../items/index?item_id=$item_id&#templates"
Index: openacs-4/packages/cms/www/modules/items/templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/templates.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/templates.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/templates.tcl	24 May 2001 23:57:17 -0000	1.3
@@ -5,8 +5,6 @@
 request set_param item_id -datatype integer
 request set_param mount_point -datatype keyword -optional -value sitemap
 
-set db [template::get_db_handle]
-
 set user_id [User::getID]
 
 # Check permissions
@@ -16,7 +14,7 @@
   -request_error
 
 # check if the user has write permission on the types module
-template::query can_set_default_template onevalue "
+template::query allowed_set_p can_set_default_template onevalue "
   select
     cms_permission.permission_p( module_id, :user_id, 'cm_write' )
   from
Index: openacs-4/packages/cms/www/modules/permissions/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/permissions/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/permissions/index.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/permissions/index.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -9,7 +9,6 @@
 
 set user_id [User::getID]
 
-set db [template::get_db_handle]
 
 # Determine if the user can modify permissions on this object
 # Should it dump a user to an error page if no access ?
@@ -22,12 +21,11 @@
   -user_id $user_id -mount_point $mount_point -parent_id $parent_id
 
 if { ![string equal $user_permissions(cm_perm) t] } {
-  template::release_db_handle
   return
 }
 
 # Get a list of permissions that users have on the item
-template::query permissions multirow "
+template::query get_permissions permissions multirow "
   select * from ( 
     select 
       p.pretty_name, 
@@ -68,8 +66,6 @@
     grantee_name, privilege
   " 
 
-template::release_db_handle
-
 # Create a URL passthrough stub to access permissions
 set perms_url_extra "return_url=$return_url&passthrough=$passthrough&object_id=$object_id"
 
Index: openacs-4/packages/cms/www/modules/sitemap/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/move.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/move.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -12,9 +12,6 @@
   set folder_id $id
 }
 
-
-set db [template::get_db_handle]
-
 # permission check - must have cm_write 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,7 +48,6 @@
     cms_permission.permission_p(item_id, :user_id, 'cm_write') = 't'
 " 
 
-template::release_db_handle
 
 form create move
 element create move mount_point \
@@ -97,41 +93,37 @@
     form get_values move id mount_point
     set moved_items [element get_values move moved_items]
 
+    db_transaction {
+        set folder_flush_list [list]
+        foreach mv_item_id $moved_items {
+            set parent_id [element get_values move "parent_id_$mv_item_id"]
 
-    set db [template::begin_db_transaction]
+            set sql 
 
-    set folder_flush_list [list]
-    foreach mv_item_id $moved_items {
-	set parent_id [element get_values move "parent_id_$mv_item_id"]
-
-	set sql "
+            if { [catch {db_exec_plsql move_items "
 	    begin
             content_item.move(
                 item_id          => :mv_item_id,
                 target_folder_id => :folder_id
             ); 
-            end;"
+            end;"} errmsg] } {
+                # possibly a duplicate name
+                ns_log notice "move.tcl - while moving $errmsg"
+            }
 
-	if { [catch {template::query move_items dml $sql} errmsg] } {
-	    # possibly a duplicate name
-	    ns_log notice "move.tcl - while moving $errmsg"
-	}
+            # flush the cache
+            if { [lsearch -exact $folder_flush_list $parent_id] == -1 } {
+                lappend folder_flush_list $parent_id
+                if { $parent_id == $root_id } {
+                    set parent_id ""
+                }
+                cms_folder::flush $mount_point $parent_id
+            }
 
-	# flush the cache
-	if { [lsearch -exact $folder_flush_list $parent_id] == -1 } {
-	    lappend folder_flush_list $parent_id
-	    if { $parent_id == $root_id } {
-		set parent_id ""
-	    }
-	    cms_folder::flush $mount_point $parent_id
-	}
-
+        }
     }
 
-    template::end_db_transaction
-    template::release_db_handle
 
-
     # flush cache for destination folder
     if { $folder_id == $root_id } {
 	set folder_id ""
@@ -143,4 +135,4 @@
     # Specify a null id so that the entire branch will be refreshed
     template::forward \
 	    "refresh-tree?goto_id=$folder_id&mount_point=$mount_point"
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/sitemap/rename.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/rename.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/sitemap/rename.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/sitemap/rename.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,10 +5,8 @@
 request set_param mount_point -datatype keyword -value sitemap
 
 
-set db [template::get_db_handle]
 # permissions check - renaming a folder requires cm_write on the folder
 content::check_access $item_id cm_write -user_id [User::getID] 
-template::release_db_handle
 
 
 # Create then form
@@ -42,8 +40,7 @@
   set item_id [element get_value rename_folder item_id]
 
   # Get existing folder parameters
-  set db [template::get_db_handle]
-  template::query info onerow "
+  template::query get_info info onerow "
     select
       i.name, f.label, f.description
     from 
@@ -52,7 +49,6 @@
       i.item_id = :item_id
     and
       f.folder_id = :item_id"
-  template::release_db_handle
 
   element set_properties rename_folder name -value $info(name)
   element set_properties rename_folder label -value $info(label)
@@ -70,9 +66,9 @@
   form get_values rename_folder \
 	  item_id name label description parent_id mount_point
 
-  set db [template::begin_db_transaction]
+  db_transaction {
 
-  template::query rename_folder dml "
+      db_exec_plsql rename_folder "
     begin 
     content_folder.rename (
         folder_id   => :item_id, 
@@ -81,10 +77,8 @@
         description => :description
     ); 
     end;"
+  }
 
-  template::end_db_transaction
-  template::release_db_handle
-
   # flush paginator cache for this folder
   cms_folder::flush $mount_point $parent_id
 
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 -N -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
 
 
Index: openacs-4/packages/cms/www/modules/templates/assets.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/assets.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/assets.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/templates/assets.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -73,7 +73,7 @@
       if { [template::util::is_nil width] || \
            [template::util::is_nil height] } {
         set revision_id [item::get_best_revision $item_id]
-        template::query image_info onerow "
+        template::query get_image_info image_info onerow "
           select width, height from images 
           where image_id = :revision_id
         " -cache "image_width_height $revision_id"
Index: openacs-4/packages/cms/www/modules/templates/template-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-delete.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/templates/template-delete.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -32,13 +32,12 @@
 } else {
     # Otherwise, delete the item
     
-    set db [template::begin_db_transaction]
-    template::query delete_template dml "
+    db_transaction {
+        db_exec_plsql delete_template "
       begin 
         content_template.delete(:template_id); 
       end;" 
-    template::end_db_transaction
-    template::release_db_handle
+    }
 
     template::forward "../templates/index?id="
 }
Index: openacs-4/packages/cms/www/modules/templates/template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/templates/template.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -16,30 +16,29 @@
 # The root ID is to determine the appropriate path to the item
 set root_id [cm::modules::templates::getRootFolderID]
 
-set db [template::get_db_handle]
 
 # resolve any symlinks
-template::query resolved_template_id onevalue "
+template::query get_id resolved_template_id onevalue "
   select content_symlink.resolve(:template_id) from dual
 " 
 
 set template_id $resolved_template_id
 
 # get the path
-template::query path onevalue "
+template::query get_path path onevalue "
   select content_item.get_path(:template_id, :root_id) from dual
 " 
 
 # check for valid template_id
 if { [template::util::is_nil path] } {
-  template::release_db_handle
   ns_log Notice "/templates/template.tcl - BAD TEMPLATE_ID - $template_id"
   template::forward "../sitemap/index?mount_point=templates&id="
 }
 
 
 # get the context bar info
-set query "select
+
+template::query context multirow "select
       t.tree_level, t.context_id, content_item.get_title(t.context_id) as title
     from (
       select 
@@ -58,11 +57,9 @@
     order by
       tree_level desc"
 
-template::query context multirow $query
 
-
 # find out which items this template is registered to
-template::query items multirow "
+template::query get_items items multirow "
   select
     content_item.get_title(item_id) title, item_id, use_context
   from
@@ -74,7 +71,7 @@
 
 
 # find out which types this template is registered to
-template::query types multirow "
+template::query get_types types multirow "
   select
     pretty_name, content_type, use_context
   from
@@ -85,5 +82,3 @@
     types.object_type = map.content_type
   order by
     types.pretty_name"
-
-template::release_db_handle
\ No newline at end of file
Index: openacs-4/packages/cms/www/modules/types/content-method-set-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method-set-default.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/content-method-set-default.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/content-method-set-default.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -14,20 +14,16 @@
 }
 
 
-set db [template::begin_db_transaction]
-
-template::query set_content_method_default dml "
+db_transaction {
+    db_exec_plsql set_content_method_default "
   begin
   content_method.set_default_method (
       content_type   => :content_type,
       content_method => :content_method
   );
-  end;
-"
+  end;"
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 content_method::flush_content_methods_cache $content_type
 
-template::forward $return_url
\ No newline at end of file
+template::forward $return_url
Index: openacs-4/packages/cms/www/modules/types/content-method-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method-unregister.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/content-method-unregister.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/content-method-unregister.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -14,19 +14,16 @@
 }
 
 
-set db [template::begin_db_transaction]
-
-template::query content_method_unregister dml "
+db_transaction {
+    db_exec_plsql content_method_unregister "
   begin
   content_method.remove_method (
       content_type   => :content_type,
       content_method => :content_method
   );
   end;
 "
+}
 
-template::end_db_transaction
-template::release_db_handle
 
-
-template::forward $return_url
\ No newline at end of file
+template::forward $return_url
Index: openacs-4/packages/cms/www/modules/types/content-method-unset-default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method-unset-default.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/content-method-unset-default.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/content-method-unset-default.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -14,19 +14,17 @@
 
 
 set db [template::begin_db_transaction]
-
-template::query unset_content_method_default dml "
+db_transaction {
+    db_exec_plsql unset_content_method_default "
   begin
     content_method.unset_default_method (
       content_type   => :content_type
     );
   end;
 "
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 content_method::flush_content_methods_cache $content_type
 
 
-template::forward $return_url
\ No newline at end of file
+template::forward $return_url
Index: openacs-4/packages/cms/www/modules/types/content-method.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content-method.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/content-method.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/content-method.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -11,10 +11,9 @@
     set return_url "index?id=$content_type"
 }
 
-set db [template::get_db_handle]
 
 # fetch the content methods registered to this content type
-template::query content_methods multirow "
+template::query get_methods content_methods multirow "
   select
     m.content_method, label, is_default, description
   from
@@ -30,7 +29,7 @@
 
 # text_entry content method filter
 # don't show text entry if a text mime type is not registered to the item
-template::query has_text_mime_type onevalue "
+template::query check_status has_text_mime_type onevalue "
   select
     count( mime_type )
   from
@@ -49,7 +48,7 @@
 
 
 # fetch the content methods not register to this content type
-template::query unregistered_content_methods multilist "
+template::query get_unregistered_methods unregistered_content_methods multilist "
   select
     label, m.content_method
   from
@@ -70,10 +69,7 @@
 
 set unregistered_method_count [llength $unregistered_content_methods]
 
-template::release_db_handle
 
-
-
 # form to register unregistered content methods to this content type
 form create register
 
@@ -104,9 +100,9 @@
     form get_values register content_type content_method
     
     set db [template::begin_db_transaction]
+    db_transaction {
 
-
-    template::query content_method_add dml "
+        template::query add_method content_method_add dml "
       begin
       content_method.add_method (
           content_type   => :content_type,
@@ -115,10 +111,8 @@
       );
       end;
     "
+}
 
-    template::end_db_transaction
-    template::release_db_handle
-
     content_method::flush_content_methods_cache $content_type
 
     template::forward $return_url
Index: openacs-4/packages/cms/www/modules/types/mime-types.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/mime-types.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/mime-types.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/mime-types.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,16 +5,14 @@
 request create
 request set_param content_type -datatype keyword -value 'content_revision'
 
-set db [template::get_db_handle]
-
-query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select module_id from cm_modules where key = 'types'
 "
 
 # permissions check - must have cm_examine
 content::check_access $module_id cm_examine -user_id [User::getID]
 
-template::query content_type_name onevalue "
+template::query get_name content_type_name onevalue "
   select
     pretty_name
   from
@@ -23,7 +21,7 @@
     object_type = :content_type
 "
 
-template::query unregistered_mime_types multilist "
+template::query get_unreg_mime_types unregistered_mime_types multilist "
   select
     label, mime_type
   from 
@@ -43,15 +41,12 @@
 set unregistered_mime_types_count [llength $unregistered_mime_types]
 
 if { [template::util::is_nil content_type_name] } {
-    template::release_db_handle
     ns_log Notice \
       "register-mime-types.tcl - ERROR:  BAD CONTENT_TYPE - $content_type"
     template::forward "index?id=content_revision"
 }
 
-set db [template::get_db_handle]
-
-template::query registered_mime_types multirow "
+template::query get_reg_mime_types registered_mime_types multirow "
   select 
     label, m.mime_type
   from
@@ -64,9 +59,6 @@
     label
 " 
   
-template::release_db_handle
-
-
 set page_title "Register MIME types to $content_type_name"
 
 
@@ -93,20 +85,20 @@
 
 if { [form is_valid register] } {
     form get_values register content_type mime_type
-    set db [template::begin_db_transaction]
 
-    template::query register_mime_type dml "
+    db_transaction {
+
+        db_exec_plsql register_mime_type "
       begin
         content_type.register_mime_type (
             content_type => :content_type,
             mime_type    => :mime_type
         );
       end;"
 
-    template::end_db_transaction
-    ns_db releasehandle $db
+    }
 
     content_method::flush_content_methods_cache $content_type
 
     template::forward "index?id=$content_type"
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/types/register-templates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/register-templates.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/register-templates.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -150,21 +150,17 @@
 	eval "set template_id $$id_name"
 	eval "set context $$context_name"
 
-	set sql "begin
+        db_transaction {
+            db_exec_plsql register_templates "begin
                    content_type.register_template(
                        content_type => :content_type,
 	               template_id  => :template_id,
 	               use_context  => :context );
                  end;"
+        }
 
-	set db [template::begin_db_transaction]
-	template::query register_templates dml $sql
-        template::end_db_transaction
-        template::release_db_handle
-
     }
 
-
     forward "index?id=$content_type"
 
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/types/relation-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relation-register.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/relation-register.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -2,9 +2,8 @@
 request set_param rel_type     -datatype keyword
 request set_param content_type -datatype keyword -value content_revision
 
-set db [template::get_db_handle]
 
-template::query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select module_id from cm_modules where key = 'types'
 " 
 
@@ -25,11 +24,10 @@
     set type_label "Child Content Type"
 
 } else {
-    template::release_db_handle
     template::forward index?id=$content_type
 }
 
-template::query pretty_name onevalue "
+template::query get_pretty_name pretty_name onevalue "
   select
     pretty_name
   from
@@ -38,7 +36,7 @@
     object_type = :content_type
 " 
 
-template::query target_types multilist "
+template::query get_target_types target_types multilist "
   select
     lpad(' ', level, '-') || pretty_name, object_type
   from
@@ -49,9 +47,6 @@
     object_type = 'content_revision'
 " 
 
-template::release_db_handle
-
-
 element create relation target_type \
 	-datatype keyword \
 	-widget select \
@@ -115,16 +110,13 @@
           end;"
     }
 
-    set db [template::begin_db_transaction]
+    db_transaction {
 
-    if { [catch {template::query register_rel_types dml $sql} errmsg] } {
-	template::release_db_handle
-	template::request::error register_relation_type \
+        if { [catch {db_exec_plsql register_rel_types $sql} errmsg] } {
+            template::request::error register_relation_type \
 		"Could not register relation type - $errmsg"
-    }
-    
-    template::end_db_transaction
-    template::release_db_handle
+        }
+    }    
 
     template::forward "index?id=$content_type"
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/types/relation-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-unregister.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/relation-unregister.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -8,9 +8,7 @@
 request set_param target_type -datatype keyword
 request set_param relation_tag -datatype text -value ""
 
-set db [template::get_db_handle]
-
-template::query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select module_id from cm_modules where key = 'types'
 "
 
@@ -41,17 +39,13 @@
 
 } else {
     # bad rel_type, don't do anything
-    template::release_db_handle
     template::forward "index?id=$content_type"
 }
 
 
-if { [catch {ns_ora dml $db $sql} errmsg] } {
-    template::release_db_handle
+if { [catch {db_exec_plsql unregister $sql} errmsg] } {
     template::request::error unregister_relation_type \
 	    "Could not unregister relation type - $errmsg"
 }
 
-template::release_db_handle
-
-template::forward "index?id=$content_type"
\ No newline at end of file
+template::forward "index?id=$content_type"
Index: openacs-4/packages/cms/www/modules/types/relations.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relations.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relations.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/relations.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,17 +5,15 @@
 request create
 request set_param type -datatype integer -value content_revision
 
-set db [template::get_db_handle]
-
-template::query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select module_id from cm_modules where key = 'types'
 " 
 
 # permission check - must have cm_examine on types module
 content::check_access $module_id cm_examine -user_id [User::getID] 
 
 
-template::query rel_types multirow "
+template::query get_rel_types rel_types multirow "
   select
     pretty_name, target_type, relation_tag, min_n, max_n
   from
@@ -29,7 +27,7 @@
 " 
 
 
-template::query child_types multirow "
+template::query get_child_types child_types multirow "
   select
     pretty_name, child_type, relation_tag, min_n, max_n
   from
@@ -41,5 +39,3 @@
   order by
     pretty_name, relation_tag
 " 
-
-template::release_db_handle
Index: openacs-4/packages/cms/www/modules/types/set-default-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/set-default-template.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/set-default-template.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/set-default-template.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -8,22 +8,19 @@
 request set_param content_type -datatype keyword
 request set_param return_url   -datatype text     -optional
 
+db_transaction {
 
-set db [template::begin_db_transaction]
 
-
 # set the default template, automatically unsetting any preexisting default
-template::query set_default_template dml "
+db_exec_plsql set_default_template "
   begin
   content_type.set_default_template(
       template_id  => :template_id,
       content_type => :content_type,
       use_context  => :context );
   end;"
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 # set the default return_url if none exists
 if { [template::util::is_nil return_url] } {
     set return_url "index?id=$content_type&mount_point=types"
Index: openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/unregister-mime-type.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,26 +6,25 @@
 request set_param content_type -datatype keyword
 request set_param mime_type -datatype text
 
-set db [template::begin_db_transaction]
 
-template::query module_id onevalue "
+db_transaction {
+
+    template::query get_module_id module_id onevalue "
   select module_id from cm_modules where key = 'types'
 " 
 
-# permissions check - must have cm_write to unregister mime type
-content::check_access $module_id cm_write -user_id [User::getID]
+    # permissions check - must have cm_write to unregister mime type
+    content::check_access $module_id cm_write -user_id [User::getID]
 
-template::query unregister_mime_type dml "
+    db_exec_plsql unregister_mime_type "
   begin
     content_type.unregister_mime_type(
         content_type => :content_type,
         mime_type    => :mime_type
     );
   end;"
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 content_method::flush_content_methods_cache $content_type
 
 template::forward "index?id=$content_type"
Index: openacs-4/packages/cms/www/modules/types/unregister-template.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/unregister-template.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/unregister-template.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/unregister-template.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -8,17 +8,14 @@
 request set_param content_type -datatype keyword
 
 
-set db [template::begin_db_transaction]
-
-template::query unregister_template dml "
+db_transaction {
+    db_exec_plsql unregister_template "
   begin
     content_type.unregister_template(
       template_id  => :template_id,
       content_type => :content_type,
       use_context  => :context );
   end;"
+}
 
-template::end_db_transaction
-template::release_db_handle
-
 template::forward "../types/index?id=$content_type&mount_point=types"
Index: openacs-4/packages/cms/www/modules/types/widget-register-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-2.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-2.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -15,9 +15,8 @@
 }
 
 
-set db [template::get_db_handle]
 
-template::query attribute_info onerow "
+template::query get_attr_info attribute_info onerow "
   select
     a.pretty_name as attribute_name_pretty, 
     a.attribute_name,
@@ -45,7 +44,7 @@
 
 
 # get a list of params for this widget
-template::query widget_params multilist "
+template::query get_params widget_params multilist "
   select
     f.param_id, param, 
     decode(f.is_required,'t','t',w.is_required) is_required, is_html, 
@@ -68,9 +67,7 @@
     f.param_id = w.param_id (+)
 "
 
-template::release_db_handle
 
-
 # create form sections and elements for each widget param
 set i 0
 foreach wparam $widget_params { 
@@ -100,15 +97,13 @@
     form get_values widget_register \
 	    content_type attribute_name param_count
 
-    set db [template::begin_db_transaction]
+    db_transaction {
 
-    for { set i 0 } { $i < $param_count } { incr i } {
-	widget::process_param $db \
+        for { set i 0 } { $i < $param_count } { incr i } {
+            widget::process_param $db \
 		widget_register $i $content_type $attribute_name
+        }
     }
 
-    template::end_db_transaction
-    template::release_db_handle
-
     wizard forward
 }
Index: openacs-4/packages/cms/www/modules/types/widget-register-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-3.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-3.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-3.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -19,9 +19,8 @@
 wizard submit widget_preview -buttons { back finish }
 
 if { [form is_request widget_preview] } {
-    set db [template::get_db_handle]
 
-    template::query outstanding_params_list onelist "
+    template::query get_outstanding outstanding_params_list onelist "
       select
         distinct param
       from
@@ -44,7 +43,7 @@
     # the number of required widget params that are missing
     set outstanding_params [llength $outstanding_params_list]
 
-    template::query attribute_names onerow "
+    template::query get_names attribute_names onerow "
       select
         pretty_name, attribute_name, object_type
       from
@@ -53,8 +52,6 @@
         attribute_id = :attribute_id
     "
 
-    template::release_db_handle
-
     template::util::array_to_vars attribute_names
     content::add_attribute_element widget_preview $object_type $attribute_name
 }
Index: openacs-4/packages/cms/www/modules/types/widget-register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,9 +5,8 @@
 request set_param content_type -datatype keyword
 request set_param widget -datatype keyword -optional
 
-set db [template::get_db_handle]
 
-template::query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select
     module_id
   from
@@ -19,7 +18,6 @@
 # permissions check - need cm_write on types module to edit a widget
 content::check_access $module_id cm_write -user_id [User::getID] 
 
-template::release_db_handle
 
 wizard set_param attribute_id $attribute_id
 wizard set_param content_type $content_type
Index: openacs-4/packages/cms/www/modules/types/widget-unregister.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-unregister.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-unregister.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -1,11 +1,10 @@
 request create
 request set_param attribute_id -datatype integer
 
-set db [template::get_db_handle]
 
 # permissions check - must have cm_write on the types module to unregister
 #  a widget
-template::query module_id onevalue "
+template::query get_module_id module_id onevalue "
   select
     module_id
   from
@@ -17,7 +16,7 @@
 content::check_access $module_id cm_write -user_id [User::getID]
 
 
-template::query attribute_info onerow "
+template::query get_attr_info attribute_info onerow "
   select
     attribute_name, object_type as content_type
   from
@@ -28,19 +27,17 @@
 
 template::util::array_to_vars attribute_info
 
-set sql "
+
+if { [catch {db_exec_plsql unregister "
   begin
   cm_form_widget.unregister_attribute_widget (
       content_type   => :content_type,
       attribute_name => :attribute_name
   );
   end;
-"
-
-if { [catch {ns_ora dml $db $sql} errmsg] } {
+"} errmsg] } {
   template::request::error unregister_attribute_widget $errmsg
 }
 
-template::release_db_handle
 
-template::forward index?id=$content_type
\ No newline at end of file
+template::forward index?id=$content_type
Index: openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/content_symlink/delete.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -4,11 +4,9 @@
 template::request set_param id -datatype keyword
 template::request set_param parent_id -datatype keyword -optional
 
-set db [template::begin_db_transaction]
-template::query symlink_delete dml "
-  begin content_symlink.delete(:id); end;
-" 
-template::end_db_transaction
-template::release_db_handle
+db_transaction {
+    db_exec_plsql symlink_delete "
+         begin content_symlink.delete(:id); end;" 
+}
 
 template::forward "../../sitemap/refresh-tree?id=$parent_id"
Index: openacs-4/packages/cms/www/modules/users/change-user-state.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/change-user-state.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/change-user-state.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/change-user-state.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -7,13 +7,12 @@
 request set_param parent_id -datatype keyword -optional
 request set_param mount_point -datatype keyword -optional -value users
 
-set db [template::begin_db_transaction]
-template::query change_member_state dml "
+db_transaction {
+    template::query change_member_state dml "
  update membership_rels set
    member_state=:new_state 
  where 
    rel_id=:rel_id" 
-template::end_db_transaction
-template::release_db_handle
+}
 
 template::forward "index?id=$group_id&parent_id=$parent_id&mount_point=$mount_point"
Index: openacs-4/packages/cms/www/modules/users/create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/create.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/create.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/create.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -29,11 +29,9 @@
 if { [form is_request add_group] } {
   
   # Get the next folder id
-  set db [template::get_db_handle]
-  template::query group_id onevalue "
+  template::query get_group_id group_id onevalue "
     select acs_object_id_seq.nextval from dual
   "
-  template::release_db_handle
 
   element set_properties add_group group_id -value $group_id
 }
@@ -46,27 +44,25 @@
   template::form get_values add_group group_name parent_id \
                             group_id user_id email url
 
-  set db [template::begin_db_transaction]
+  db_transaction {
 
-  ns_ora exec_plsql_bind $db "begin :1 := acs_group.new(
+      set group_id [db_exec_plsql new_group "begin :1 := acs_group.new(
     group_id => :group_id, 
     group_name => :group_name, 
     email => :email,
     url => :url,
     creation_user => :user_id, 
-    creation_ip => :ip ); end;" [list 1] group_id
+    creation_ip => :ip ); end;"]
 
-  if { ![util::is_nil parent_id] } {
-    ns_ora exec_plsql_bind $db "begin :1 := composition_rel.new(
+      if { ![util::is_nil parent_id] } {
+          set rel_id [db_exec_plsql new_rel "begin :1 := composition_rel.new(
     object_id_one => :parent_id,
     object_id_two => :group_id,
     creation_user => :user_id, 
-    creation_ip => :ip ); end;" [list 1] rel_id
+    creation_ip => :ip ); end;"]
+      }
   }
 
-  template::end_db_transaction
-  template::release_db_handle
-
   # Update the folder and refresh the tree
   refreshCachedFolder $user_id sitemap $parent_id
 
Index: openacs-4/packages/cms/www/modules/users/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/delete.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/delete.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,7 +6,7 @@
 request set_param mount_point -datatype keyword -optional -value users
 
 # Determine if the group is empty
-template::query is_empty onevalue "
+template::query get_status is_empty onevalue "
   select NVL((select 'f' from dual where exists (
             select 1 from acs_rels 
               where object_id_one = :id 
@@ -24,10 +24,9 @@
 } else {
 
   # Otherwise, delete the group
-  set db [template::begin_db_transaction]
-  template::query delete_group dml "begin acs_group.delete(:id); end;"
-  template::end_db_transaction
-  template::release_db_handle
+  db_transaction {
+      db_exec_plsql delete_group "begin acs_group.delete(:id); end;"
+  }
 
   # Remove it from the clipboard, if it exists
   set clip [clipboard::parse_cookie]
Index: openacs-4/packages/cms/www/modules/users/edit-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit-user.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/edit-user.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/edit-user.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -89,18 +89,18 @@
   }
 
   set db [template::begin_db_transaction]
-  template::query edit_user_1 dml "
+  db_transaction {
+      db_dml edit_user_1 "
     update users $users_update where user_id = :item_id
   "
-  template::query edit_user_2 dml "
+      db_dml edit_user_2 "
     update persons set first_names=:first_names, last_name = :last_name 
       where person_id=:item_id
   "
-  template::query edit_user_3 dml "
+      db_dml edit_user_3 "
     update parties set email=:email, url=:url where party_id = :item_id
   "
-  template::end_db_transaction
-  template::release_db_handle
+  }
 
   template::forward "one-user?id=$item_id&parent_id=$parent_id&mount_point=$mount_point"
 
Index: openacs-4/packages/cms/www/modules/users/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/edit.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/edit.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -53,18 +53,16 @@
                             email url mount_point
 
   set db [template::begin_db_transaction]
-  template::query edit_group_1 dml "
+  db_transaction {
+      db_dml edit_group_1 "
     update groups 
       set group_name = :group_name
-      where group_id = :group_id
-  "
-  template::query edit_group_2 dml "
+      where group_id = :group_id"
+      db_dml edit_group_2 "
     update parties
       set email = :email, url = :url
-      where party_id = :group_id
-  "
-  template::end_db_transaction
-  template::release_db_handle
+      where party_id = :group_id"
+  }
 
   refreshCachedFolder $user_id $mount_point $parent_id
 
Index: openacs-4/packages/cms/www/modules/users/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/index.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/index.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -12,7 +12,7 @@
 # Determine if the user has admin privileges on the user module
 set user_id [User::getID]
 set module_id [cm::modules::get_module_id $mount_point]
-template::query admin_p onevalue "
+template::query check_admin admin_p onevalue "
   select 
     cms_permission.permission_p (:module_id, :user_id, 'cm_admin')
   from
@@ -22,7 +22,7 @@
   set admin_url "make-admin?mount_point=$mount_point&parent_id=$parent_id&target_user_id="
 }
 
-template::query perm_p onevalue "
+template::query check_perm perm_p onevalue "
   select 
     cms_permission.permission_p (:module_id, :user_id, 'cm_perm')
   from
@@ -39,7 +39,7 @@
   set current_id $id
 
   # Get info about the current group
-  query info onerow "
+  template::query get_info1 info onerow "
     select 
       g.group_id, g.group_name, p.email, p.url,
       NVL((select 'f' from dual where exists (
@@ -126,7 +126,7 @@
   set current_id $module_id
 
   # the everyone party
-  query info onerow "
+  template::query get_info2 info onerow "
     select
       party_id group_id, 'All Users' as group_name, 
       email, url, 'f' as is_empty
@@ -180,7 +180,7 @@
 }
 
 # Select subgroups, users
-query subgroups multirow $groups_query
-query users multirow $users_query -eval $users_eval
+template::query get_subgroups subgroups multirow $groups_query
+template::query get_users users multirow $users_query -eval $users_eval
 
-set return_url [ns_conn url]
\ No newline at end of file
+set return_url [ns_conn url]
Index: openacs-4/packages/cms/www/modules/users/one-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/one-user.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/one-user.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/one-user.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,7 +6,7 @@
 set passthrough "mount_point=$mount_point&parent_id=$parent_id"
 
 # Find basic user params
-template::query info onerow "
+template::query get_info info onerow "
   select
     p.first_names, p.last_name, 
     pp.email, pp.url, 
@@ -24,7 +24,7 @@
 "
 
 # Find the groups to which this user belongs
-template::query groups multirow "
+template::query get_groups groups multirow "
   select 
     g.group_name, g.group_id
   from
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 -N -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
 
Index: openacs-4/packages/cms/www/modules/users/user-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/user-search.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/users/user-search.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/users/user-search.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -37,7 +37,7 @@
 
 if { [util::is_nil form_title] } {
   if { ![util::is_nil group_id] } {
-    template::query who onevalue "select acs_object.name(:group_id) from dual"
+    template::query get_who who onevalue "select acs_object.name(:group_id) from dual"
     set form_title "Search members of $who"
   } else {
     set form_title "Search All Users"
Index: openacs-4/packages/cms/www/modules/workflow/case-status.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/case-status.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/case-status.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/case-status.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -11,7 +11,6 @@
   mount_point -datatype keyword -optional -value sitemap
 }
 
-set db [template::get_db_handle]
 
 # Check permissions
 content::check_access $item_id cm_item_workflow \
@@ -23,25 +22,23 @@
 
 #set query "select case_id, initcap(toplevel_state) state
 #           from wf_cases where object_id = :item_id"
-set query "select case_id, initcap(state) state
+
+template::query get_caseinfo caseinfo onerow "select case_id, initcap(state) state
            from wf_cases where object_id = :item_id"
 
-template::query caseinfo onerow $query 
-
 # Look up the enabled or started transition for this workflow, if any: 
 
 if { ! [template::util::is_nil caseinfo] } {
 
   set case_id $caseinfo(case_id)
 
-  set query "select k.transition_key, k.task_id, t.transition_name,
+  template::query get_transinfo transinfo onerow "select k.transition_key, k.task_id, t.transition_name,
              k.holding_user, 
              content_workflow.get_holding_user_name(k.task_id) hold_name
              from wf_tasks k, wf_transitions t
 	     where k.case_id = :case_id 
              and k.state in ('enabled', 'started')
              and k.transition_key = t.transition_key"
-  template::query transinfo onerow $query 
 
   # Determine whether the current user is assigned to the active transition
 
@@ -50,24 +47,21 @@
     set user_id [User::getID]
     set transition_key $transinfo(transition_key)
 
-    set query "select decode(count(*), 0, 'no', 'yes')
+    template::query get_status is_assigned onevalue "select decode(count(*), 0, 'no', 'yes')
                from wf_case_assignments
                where case_id = :case_id 
                and transition_key = :transition_key 
                and party_id = :user_id"
-    template::query is_assigned onevalue $query 
 
     # if eligible, add a link to complete this task
     if { $is_assigned } {
-      set query "select to_char(deadline, 'DD MON') deadline 
+      template::query get_deadline deadlline onevalue "select to_char(deadline, 'DD MON') deadline 
 		 from wf_case_deadlines 
 		 where case_id = :case_id 
                  and transition_key = :transition_key"
-      template::query deadlline onevalue $query 
     }
   }
 }
 
-template::release_db_handle
 
 set return_url "../items/index?item_id=$item_id&mount_point=$mount_point"
Index: openacs-4/packages/cms/www/modules/workflow/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/index.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/index.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,11 +5,9 @@
 request set_param parent_id -datatype keyword -optional
 request set_param mount_point -datatype keyword -value workflow
 
-set db [template::get_db_handle]
-
 # workflow totals
 
-template::query wf_stats onerow "
+template::query get_stats wf_stats onerow "
   select
     count( decode(content_workflow.is_finished(c.case_id, transition_key),
              'f',1,null)
@@ -33,7 +31,10 @@
     c.state = 'active'
 " 
     
-set sql "
+
+
+# workflow tasks by transition state: content items, overdue items
+template::query get_transitions transitions multirow "
   select 
     trans.transition_key, transition_name, sort_order,
     count(transition_name) as transition_count,
@@ -64,13 +65,10 @@
     sort_order, transition_name, trans.transition_key
 "
 
-# workflow tasks by transition state: content items, overdue items
-template::query transitions multirow $sql 
 
 
-
 # workflow tasks by user: content items, overdue items
-query user_tasks multirow "
+template::query get_user_tasks user_tasks multirow "
   select
     p.person_id, p.first_names, p.last_name,
     count(transition_name) as transition_count,
@@ -108,6 +106,5 @@
     first_names, last_name, person_id 
 " 
 
-template::release_db_handle
 
 set page_title "Workflow Statistics"
Index: openacs-4/packages/cms/www/modules/workflow/task-checkin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-checkin.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-checkin.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-checkin.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -7,7 +7,6 @@
 
 
 set user_id [User::getID]
-set db [template::get_db_handle]
 
 # check that the task is still valid
 query is_valid_task onevalue "
@@ -22,7 +21,7 @@
 
 # task info
 
-template::query task_info onerow "
+template::query get_task_info task_info onerow "
   select
     c.object_id, tr.transition_name,
     content_item.get_title(c.object_id) title,
@@ -39,9 +38,7 @@
     tk.case_id = c.case_id
 " 
 
-template::release_db_handle
 
-
 set holding_user $task_info(holding_user)
 
 
@@ -105,19 +102,18 @@
     set db [template::begin_db_transaction]
 
     # check that the task is still valid
-    template::query is_valid_task onevalue "
+    template::query get_task_status is_valid_task onevalue "
       select content_workflow.can_approve( :task_id, :user_id ) from dual
     " 
 
     if { [string equal $is_valid_task f] } {
-	ns_ora dml $db "abort transaction"
-	template::release_db_handle $db
+	db_dml abort "abort transaction"
 	template::request::error invalid_task \
 		"task-checkin.tcl - invalid task - $task_id"
 	return
     }
 
-    template::query workflow_checkin dml "
+    db_exec_plsql workflow_checkin "
       begin
       content_workflow.checkin(
           task_id      => :task_id,             
@@ -126,10 +122,6 @@
           msg          => :msg
       );
       end;
-    "
-
-    template::end_db_transaction
-    template::release_db_handle
-    
+    "    
     template::forward $return_url
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/workflow/task-finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-finish.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-finish.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-finish.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -12,7 +12,7 @@
 set db [template::get_db_handle]
 
 # check that the task is still valid
-template::query is_valid_task onevalue "
+template::query get_status is_valid_task onevalue "
   select content_workflow.can_approve( :task_id, :user_id ) from dual
 " 
 
@@ -23,7 +23,7 @@
 
 
 # Get the name of the item and of the task
-template::query task_info onerow "
+template::query get_task_info task_info onerow "
   select
     c.object_id, content_item.get_title(c.object_id) title, 
     tr.transition_name
@@ -89,37 +89,31 @@
     set ip_address [ns_conn peeraddr]    
     set user_id [User::getID]
 
+    db_transaction {
+        template::query get_status is_valid_task onevalue "
+             select content_workflow.can_approve( :task_id, :user_id ) from dual"
 
-    set db [template::begin_db_transaction]
-
-    template::query is_valid_task onevalue "
-      select content_workflow.can_approve( :task_id, :user_id ) from dual
-    "
-
-    if { [string equal $is_valid_task f] } {
-	ns_ora dml $db "abort transaction"
-	template::release_db_handle
-	template::request::error invalid_task \
+        if { [string equal $is_valid_task f] } {
+            db_dml abort "abort transaction"
+            template::request::error invalid_task \
 		"task-finish.tcl - This task is no longer valid - $task_id"
-	return
-    }
+            return
+        }
 
-    template::query workflow_approve dml "
-      begin
-      content_workflow.approve(
-          task_id    => :task_id,
-          user_id    => :user_id,
-          ip_address => :ip_address,
-          msg        => :msg
-      );
-      end;
-    "
+        db_exec_plsql workflow_approve "
+           begin
+               content_workflow.approve(
+                       task_id    => :task_id,
+                       user_id    => :user_id,
+                       ip_address => :ip_address,
+                       msg        => :msg
+                 );
+            end;"
 
-    # send email notification to the creator of the item
-    workflow::notify_admin_of_finished_task $db $task_id
+        # send email notification to the creator of the item
+        workflow::notify_admin_of_finished_task $db $task_id
 
-    template::end_db_transaction
-    template::release_db_handle
+    }
 
     # Flush the access cache in order to clear permissions
     content::flush_access_cache $task_info(object_id)
Index: openacs-4/packages/cms/www/modules/workflow/task-reject.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-reject.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-reject.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-reject.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -7,23 +7,20 @@
 
 
 set user_id [User::getID]
-set db [template::get_db_handle]
 
-
 # check that the task is still valid
-template::query is_valid_task onevalue "
+template::query get_status is_valid_task onevalue "
   select content_workflow.can_reject( :task_id, :user_id ) from dual
 " 
 
 if { [string equal $is_valid_task f] } {
-    template::release_db_handle
     forward $return_url
 }
 
 
 
 # Get the name of the item and of the task
-template::query task_info onerow "
+template::query get_task_info task_info onerow "
   select
     c.object_id, content_item.get_title(c.object_id) title, 
     tr.transition_name
@@ -46,7 +43,7 @@
 
 
 # get the places I can reject to
-template::query reject_places multilist "
+template::query get_rejects reject_places multilist "
   select
     trans.transition_name, trans.transition_key
   from
@@ -71,8 +68,6 @@
     dest.sort_order desc
 " 
 
-template::release_db_handle
-
 # Create the form
 
 form create reject -elements {
@@ -126,37 +121,30 @@
     set ip_address [ns_conn peeraddr]    
     set user_id [User::getID]
 
+    db_transaction {
+        # check that the task is still valid
+        template::query is_valid_task onevalue "
+             select content_workflow.can_reject( :task_id, :user_id ) from dual" 
 
-    set db [template::begin_db_transaction]
-
-    # check that the task is still valid
-    template::query is_valid_task onevalue "
-      select content_workflow.can_reject( :task_id, :user_id ) from dual
-    " 
-
-    if { [string equal $is_valid_task f] } {
-	ns_ora dml $db "abort transaction"
-	template::release_db_handle
-	template::request::error invalid_task \
+        if { [string equal $is_valid_task f] } {
+            db_dml abort "abort transaction"
+            template::request::error invalid_task \
 		"task-reject.tcl - invalid task - $task_id"
-	return
+            return
+        }
+
+        db_exec_plsql workflow_reject "
+                      begin
+                        content_workflow.reject(
+                             task_id        => :task_id,
+                             user_id        => :user_id,
+                             ip_address     => :ip_address,
+                             transition_key => :transition_key,
+                             msg            => :msg
+                         );
+                       end;"
     }
 
-    template::query workflow_reject dml "
-      begin
-      content_workflow.reject(
-          task_id        => :task_id,
-          user_id        => :user_id,
-          ip_address     => :ip_address,
-          transition_key => :transition_key,
-          msg            => :msg
-      );
-      end;
-    "
-
-    template::end_db_transaction
-    template::release_db_handle
-
     # Flush the access cache in order to clear permissions
     content::flush_access_cache $task_info(object_id)
 
Index: openacs-4/packages/cms/www/modules/workflow/task-start.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-start.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-start.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-start.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,22 +6,20 @@
 request set_param return_url -datatype text -value "../workspace/index"
 
 set user_id [User::getID]
-set db [template::get_db_handle]
 
 # make sure the task hasn't expired yet
-template::query is_valid_task onevalue "
+template::query get_status is_valid_task onevalue "
   select content_workflow.can_start( :task_id, :user_id ) from dual
 " 
 
 # if the task is no longer valid, go to My Tasks page
 if { [string equal $is_valid_task f] } {
-  template::release_db_handle
   template::forward $return_url
 }
 
 
 # task info
-template::query task_info onerow "
+template::query get_task_info task_info onerow "
   select
     c.object_id, tr.transition_name,
     content_item.get_title(c.object_id) title,
@@ -40,8 +38,6 @@
     tk.case_id = c.case_id
 " 
 
-template::release_db_handle
-
 set holding_user $task_info(holding_user)
 
 form create task_start -elements {
@@ -117,21 +113,19 @@
     set user_id [User::getID]
 
     set db [template::begin_db_transaction]
+    db_transaction {
+        # check that task has not expired, if it has display error msg
+        template::query get_status is_valid_task onevalue "
+      select content_workflow.can_start( :task_id, :user_id ) from dual" 
 
-    # check that task has not expired, if it has display error msg
-    template::query is_valid_task onevalue "
-      select content_workflow.can_start( :task_id, :user_id ) from dual
-    " 
-
-    if { [string equal $is_valid_task f] } {
-	ns_ora dml $db "abort transaction"
-	template::release_db_handle
-	template::request::error invalid_task \
+        if { [string equal $is_valid_task f] } {
+            db_dml abort "abort transaction"
+            template::request::error invalid_task \
 		"task-start.tcl - invalid task - $task_id"
-	return
-    }
+            return
+        }
 
-    template::query workflow_checkout dml "
+        db_exec_plsql workflow_checkout "
       begin
       content_workflow.checkout(
           task_id      => :task_id,             
@@ -142,9 +136,7 @@
       );
       end;
     "
-
-    template::end_db_transaction
-    template::release_db_handle
+    }
     
     template::forward $return_url
-}
\ No newline at end of file
+}
Index: openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/user-tasks.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -6,14 +6,13 @@
 
 set date_format "'Mon. DD, YYYY HH24:MI:SS'"
 
-template::query party_name onevalue "
+template::query get_party_name party_name onevalue "
   select nvl(party.name(:party_id),person.name(:party_id)) from dual
 " 
 
-
 set date_format "'Mon., DD, YYYY HH24:MI:SS'"
 
-set sql "
+template::query get_active active_tasks multirow  "
   select
     trans.transition_key, transition_name, 
     item_id, content_item.get_title(item_id) as title,
@@ -51,9 +50,8 @@
     trans.sort_order, title"
 
 
-template::query active_tasks multirow $sql 
 
-set sql "
+template::query get_waiting awaiting_tasks multirow "
   select
     ca.transition_key, transition_name, 
     item_id, content_item.get_title(item_id) as title,
@@ -95,6 +93,4 @@
   order by
     trans.sort_order, title"
 
-template::query awaiting_tasks multirow $sql
-
-set page_title "Workflow Tasks Assigned to $party_name"
\ No newline at end of file
+set page_title "Workflow Tasks Assigned to $party_name"
Index: openacs-4/packages/cms/www/modules/workflow/workflow.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/workflow.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/workflow.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/workflow.tcl	24 May 2001 23:57:17 -0000	1.2
@@ -5,14 +5,12 @@
 request set_param transition -datatype keyword -value "all"
 
 
-set db [template::get_db_handle]
-
 if { [string equal $transition "all"] } {
     set transition_name "All Tasks"
     set transition_sql ""
 } else {
 
-    template::query transition_name onevalue "
+    template::query get_name transition_name onevalue "
       select 
         transition_name 
       from 
@@ -25,7 +23,6 @@
       -timeout 3600
 
     if { [template::util::is_nil transition_name] } {
-	template::release_db_handle
 	ns_log notice "workflow.tcl - Bad transition - $transition"
 	forward "workflow"
     }
@@ -36,7 +33,9 @@
 
 set date_format "'Mon. DD, YYYY HH24:MI:SS'"
 
-set sql "
+
+
+template::query get_active active_tasks multirow "
   select
     t.transition_key, transition_name, 
     item_id, content_item.get_title(item_id) as title,
@@ -76,11 +75,7 @@
     trans.sort_order, title, assigned_party, deadline desc, state
 "
 
-template::query active_tasks multirow $sql 
-
-
-
-set sql "
+template::query get_waiting awaiting_tasks multirow "
   select
     ca.transition_key, transition_name, ca.party_id,
     item_id, content_item.get_title(item_id) as title,
@@ -125,8 +120,4 @@
   order by
     trans.sort_order, title, assigned_party, dead.deadline desc"
 
-template::query awaiting_tasks multirow $sql 
-
-template::release_db_handle
-
 set page_title "Workflow Tasks - $transition_name"