Index: openacs-4/packages/acs-templating/www/doc/demo/form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/form.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/form.tcl	20 Feb 2002 21:07:13 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/form.tcl	22 Aug 2002 03:13:24 -0000	1.4
@@ -16,8 +16,7 @@
 
 if { [form is_request add_user] } {
 
-    set query "select ad_template_sample_users_seq.nextval from dual"
-    template::query get_user_id user_id onevalue $query
+    set user_id [db_string get_user_id ""]
 
     element set_properties add_user user_id -value $user_id
 }
Index: openacs-4/packages/acs-templating/www/doc/demo/multiaccess.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/multiaccess.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/demo/multiaccess.tcl	27 Apr 2001 02:27:09 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/demo/multiaccess.tcl	22 Aug 2002 03:13:24 -0000	1.3
@@ -3,13 +3,8 @@
 # @column first_name First name of the user.
 # @column last_name Last name of the user.
 
-set query "select 
-             first_name, last_name
-           from
-             ad_template_sample_users"
 
-template::query get_users users multirow $query \
- -eval { set row(full_name) "$row(last_name), $row(first_name)" }
+db_multirow users get_users "" { set full_name "${last_name}, $first_name" }
 
 # Manually access the datasource 
 
Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl	27 Apr 2001 02:27:09 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample.tcl	22 Aug 2002 03:13:24 -0000	1.3
@@ -113,7 +113,7 @@
     template::forward form-sample.acs
 }
 
-template::query get_address address multirow "select * from address_book order by last_name"
+db_multirow address get_address ""
 
 set rowcount [set address:rowcount]
 
Index: openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl	27 Apr 2001 02:27:09 -0000	1.2
+++ openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.tcl	22 Aug 2002 03:13:24 -0000	1.3
@@ -68,7 +68,7 @@
 	"hanging out with my best buds" \
 	"telling jokes -- my friends say I've got a great sense of humor!"]
 
-template::query get_friends friends multirow "select first_names, last_name, age, gender, address, likes_chocolate_p from best_friends"
+db_multirow friends get_friends ""
 
 #template::multirow create foo_multirow columns1 columns2 columns3
 template::multirow extend friends extra_column