Index: openacs-4/packages/cms-news-demo/www/install-wizard-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms-news-demo/www/install-wizard-3.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.4.1
--- openacs-4/packages/cms-news-demo/www/install-wizard-3.tcl	20 Apr 2001 20:51:11 -0000	1.1.1.1
+++ openacs-4/packages/cms-news-demo/www/install-wizard-3.tcl	1 Mar 2003 21:55:16 -0000	1.1.1.1.4.1
@@ -7,12 +7,10 @@
 
 
 
-set db [template::get_db_handle]
-
 # get the user id of a cm_admin
-template::query cm_admin onevalue "
+db_1row cm_admin "
   select
-    distinct user_id
+    distinct user_id as cm_admin
   from
     users u, cm_modules m
   where 
@@ -26,28 +24,25 @@
 	module_id, user_id, 'cm_admin') = 't'
   and
     user_id = [User::getID]
-" -db $db
+"
 
 
 # check if author, editor, and publisher users have been created
-template::query demo_users onevalue "
+db_1row demo_users "
   select
-    count(1)
+    count(1) as demo_users
   from
     users
   where
     screen_name in ('author','editor','publisher')
-" -db $db
+"
 
 if { $demo_users < 3 } {
     set demo_users_p f
 } else {
     set demo_users_p t
 }
 
-
-template::release_db_handle
-
 if { [template::util::is_nil cm_admin] } {
     template::forward install-wizard
     return
@@ -60,20 +55,14 @@
 set creation_ip [ns_conn peeraddr]
 set user_id     $cm_admin
 
-
-
-
-
-
 # register demo users if not already registered: 
 #   author, editor, publisher
 
 set html ""
 
 if { $demo_users < 3 } {
 
-    set db [template::begin_db_transaction]
-
+    db_transaction {
     set demo_user_list \
 	    { {Author author} {Editor editor} {Publisher publisher} }
 
@@ -82,14 +71,14 @@
 	set screen_name [lindex $demo_user 1]
 	
 	# check if the user exists already
-	template::query user_exists_p onevalue "
+	db_1row user_exists_p "
 	  select
-            count(1)
+            count(1) as user_exists_p
           from
             users
 	  where
             screen_name = :screen_name
-	" -db $db
+	"
 
 	# if the user doesn't exists, create the user
 	if { $user_exists_p == 0 } {
@@ -101,7 +90,7 @@
 	    
 	    set user_id [ad_user_new $email $name $name $password "" ""]
 
-	    ns_ora dml $db "
+	    db_dml update_users "
 	    update users
               set screen_name = :screen_name
               where user_id = :user_id"
@@ -113,7 +102,7 @@
 	}
     }
 
-    template::end_db_transaction
+    }
 }
 
 
@@ -129,4 +118,4 @@
 
     template::forward install-wizard-4
 
-}
\ No newline at end of file
+}