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 -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/permissions/index.tcl	4 Sep 2001 04:50:05 -0000	1.3
+++ openacs-4/packages/cms/www/modules/permissions/index.tcl	19 Aug 2002 03:42:26 -0000	1.4
@@ -25,46 +25,7 @@
 }
 
 # Get a list of permissions that users have on the item
-template::query get_permissions permissions multirow "
-  select * from ( 
-    select 
-      p.pretty_name, 
-      p.privilege, 
-      u.party_id as grantee_id,
-      n.first_names || ' ' || n.last_name as grantee_name,
-      u.email
-    from 
-      acs_permissions per, acs_privileges p, parties u,
-      persons n,
-      (select object_id from acs_objects 
-	 connect by prior context_id = object_id 
-		and prior security_inherit_p = 't'
-	 start with object_id = :object_id) o
-    where
-      per.privilege = p.privilege
-    and
-      per.grantee_id = u.party_id
-    and
-      per.object_id = o.object_id
-    and
-      u.party_id = n.person_id
-  union
-    select
-      p.pretty_name, p.privilege, 
-      -1 as grantee_id, 'All Users' as grantee_name, ' ' as email 
-    from
-      acs_permissions per, acs_privileges p, parties u
-    where
-      u.party_id = -1
-    and
-      per.object_id = :object_id
-    and
-      per.privilege = p.privilege
-    and
-      per.grantee_id = u.party_id
-  ) order by
-    grantee_name, privilege
-  " 
+db_multirow permissions get_permissions ""
 
 
 # Create a URL passthrough stub to access permissions
Index: openacs-4/packages/cms/www/modules/permissions/permission-alter.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/permissions/permission-alter.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/permissions/permission-alter.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/permissions/permission-alter.tcl	19 Aug 2002 03:42:26 -0000	1.3
@@ -7,13 +7,7 @@
 
 set user_id [User::getID]
 
-template::query get_info info onerow "
-  select 
-    acs_object.name(:object_id) as object_name, 
-    acs_object.name(:grantee_id) as grantee_name,
-    acs_permission.permission_p(:object_id, :user_id, 'cm_perm') as user_cm_perm
-  from
-    dual"
+db_1row get_info "" -column_array info
 
 if { [string equal $info(user_cm_perm) t] } {
 
Index: openacs-4/packages/cms/www/modules/search/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/search/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/search/index.tcl	8 Sep 2001 15:16:50 -0000	1.3
+++ openacs-4/packages/cms/www/modules/search/index.tcl	19 Aug 2002 03:42:26 -0000	1.4
@@ -8,12 +8,7 @@
 set content_types [cm::modules::types::getTypesTree]
 
 # Get a list of mime-types
-template::query get_mime_types mime_types multilist "
-  select
-    label, mime_type as value
-  from 
-    cr_mime_types
-"
+set mime_types [db_list_of_lists get_mime_types ""]
 
 form create search -html { name search method post }
 
@@ -129,9 +124,7 @@
   ns_log notice $sql_query
 
   # Perform the query and get the total results
-  template::query get_results total_results onevalue "
-    select count(*) from ($sql_query)
-  " 
+  set total_results [db_string get_results ""]
 
   # Memoize the query - can't pass it through :-(
   nsv_set browser_state "[User::getID].search.sql_query" $sql_query
Index: openacs-4/packages/cms/www/modules/search/search-results.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/search/search-results.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/search/search-results.tcl	24 May 2001 01:30:52 -0000	1.2
+++ openacs-4/packages/cms/www/modules/search/search-results.tcl	19 Aug 2002 03:42:26 -0000	1.3
@@ -29,13 +29,9 @@
   set rows_per_page 10
 
   # Perform the query, get results
-  template::query get_results results multirow "
-    select * from ($sql_query) 
-    where row_index >= :start_row and row_index < (:start_row + :rows_per_page)
-    order by search_score desc, title
-  " -eval {
-    clipboard::get_bookmark_icon $clip $mount_point $row(item_id)
-    set row(offset) [expr $row(rownum) + $start_row - 1]
+  db_multirow -extend offset results get_results "" {
+    clipboard::get_bookmark_icon $clip $mount_point $item_id
+    set offset [expr $rownum + $start_row - 1]
   }
 
   # Prepare a multirow datasource for pages
Index: openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl	3 Nov 2001 05:14:56 -0000	1.6
+++ openacs-4/packages/cms/www/modules/sitemap/ancestors.tcl	19 Aug 2002 03:42:26 -0000	1.7
@@ -27,31 +27,8 @@
 
 # get the context bar info
 
-template::query get_context context multirow "
-  select
-    t.tree_level, t.parent_id, 
-    content_folder.is_folder(i.item_id) is_folder,
-    content_item.get_title(t.parent_id) as title
-  from 
-    cr_items i,
-    (
-      select 
-        parent_id, level as tree_level
-      from 
-        cr_items
-      where
-        parent_id ^= 0
-      connect by
-        prior parent_id = item_id
-      start with
-        item_id = :item_id
-    ) t
-  where
-    i.item_id = t.parent_id
-  order by
-    tree_level desc"
+db_multirow context get_context ""
 
-
 # pass in index_page_id to improve efficiency
 if { ![template::util::is_nil index_page_id] } {
 
@@ -64,26 +41,9 @@
 
 # get the path of the item
 
-template::query get_preview_info preview_info onerow "
-  select
-    $index_page_sql 
-    -- does it have a template
-    content_item.get_template( item_id, 'public' ) template_id,
-    -- symlinks to this folder will have the path of this item
-    content_item.get_virtual_path( item_id, :root_id ) virtual_path,
-    content_item.get_path( 
-      content_symlink.resolve( item_id ), :root_id ) physical_path,
-    content_folder.is_folder( item_id ) is_folder,
-    live_revision
-  from
-    cr_items
-  where 
-    item_id = :item_id" 
+db_1row get_preview_info ""
 
 template::util::array_to_vars preview_info
-
-
-template::util::array_to_vars preview_info
 # physical_path, virtual_path, is_folder, has_index_page
 
 if { [string equal $physical_path "../"] } {
@@ -125,6 +85,7 @@
 ns_log Notice "preview_p = $preview_p"
 # an item cannot be previewed if it has no associated template
 if { [string equal $has_index_page t] } {
+    set template_id [db_string get_template_id "" -default ""]
     template::query get_template_id template_id onevalue "
       select 
         content_item.get_template( 
@@ -134,7 +95,7 @@
     " 
 }
 
-if { [template::util::is_nil template_id] } { 
+if { [string equal $template_id ""] } { 
     set preview_p f
 }
 
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.4 -r1.5
--- openacs-4/packages/cms/www/modules/sitemap/copy.tcl	30 Aug 2001 03:41:34 -0000	1.4
+++ openacs-4/packages/cms/www/modules/sitemap/copy.tcl	19 Aug 2002 03:42:26 -0000	1.5
@@ -26,27 +26,10 @@
     set no_items_on_clipboard "f"
 }
 
-template::query get_path path onevalue "
-  select
-    content_item.get_path( :folder_id )
-  from 
-    dual
-" 
+set path [db_string get_path ""]
 
 # get relevant marked items
-template::query get_marked marked_items multirow "
-  select
-    content_item.get_title(item_id) title, 
-    content_item.get_path(item_id,:root_id) name, 
-    item_id, parent_id
-  from
-    cr_items
-  where
-    item_id in ([join $clip_items ","])
-  and
-    -- only for those items which user has cm_examine
-    cms_permission.permission_p(item_id, :user_id, 'cm_examine') = 't'
-"
+db_multirow marked_items get_marked ""
 
 form create copy
 element create copy mount_point \