Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/tcl/query-procs.tcl	7 May 2001 23:58:01 -0000	1.3
+++ openacs-4/packages/acs-templating/tcl/query-procs.tcl	9 May 2001 05:15:58 -0000	1.4
@@ -81,7 +81,11 @@
     @param args Optional args: uplevel, cache, maxrows
 } {
 
+  set sql [string trim $sql]
+  set full_statement_name [db_qd_get_fullname $statement_name]
+
   #set beginTime [clock clicks]
+  ns_log Notice "query sql = $sql"
 
   template::util::get_opts $args
   
@@ -103,8 +107,7 @@
   }
 
   db_with_handle db { 
-      set ret_code [template::query::$type $statement_name $db $result_name \ 
-                    $sql] 
+      set ret_code [template::query::$type $full_statement_name $db $result_name $sql] 
   }
 
   if { [info exists opts(cache)] } {
@@ -131,15 +134,13 @@
 
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
+  ns_log Notice "sql = $sql"
   upvar opts opts
 
   upvar $opts(uplevel) $result_name result
   set result ""
 
-  uplevel "set __row \[db_exec 0or1row $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec 0or1row $db $statement_name $sql 3]
 
   if { $row != "" } {
 
@@ -163,12 +164,9 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "set __row \[db_exec 0or1row $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec 0or1row $db $statement_name $sql 3]
 
   if { $row != "" } {
 
@@ -208,15 +206,11 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "set __row \[db_exec select $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec select $db $statement_name $sql 3]
 
-  upvar $opts(uplevel) $result_name:rowcount rowcount \ 
-                       $result_name:columns column_list
+  upvar $opts(uplevel) $result_name:rowcount rowcount $result_name:columns column_list
 
   # set a local variable as to whether we are cacheing or not
   if { [info exists opts(cache)] } {
@@ -240,14 +234,14 @@
     # break if maxrows has been reached
     if { $rowcount > $opts(maxrows) } {
       ns_db flush $db
-      upvar $opts(uplevel) $name:has_more_rows has_more_rows
+      upvar $opts(uplevel) ${result_name}:has_more_rows has_more_rows
       set has_more_rows 1
       incr rowcount -1
       break
     }
 
     # set the results in the calling frame
-    upvar $opts(uplevel) ${name}:$rowcount result
+    upvar $opts(uplevel) ${result_name}:$rowcount result
 
     set result(rownum) $rowcount
 
@@ -266,7 +260,7 @@
     # Execute custom code for each row
     if { [info exists opts(eval)] } {
       uplevel $opts(uplevel) "
-        upvar 0 ${name}:$rowcount row; $opts(eval)
+        upvar 0 ${result_name}:$rowcount row; $opts(eval)
       "
     }
 
@@ -287,12 +281,9 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "set __row \[db_exec select $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec select $db $statement_name $sql 3]
 
   upvar $opts(uplevel) $result_name rows
 
@@ -330,12 +321,9 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "set __row \[db_exec select $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec select $db $statement_name $sql 3]
 
   upvar $opts(uplevel) $result_name rows
   
@@ -376,12 +364,9 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "set __row \[db_exec select $db $full_statement_name $sql\]"
-  upvar __row row
+  set row [db_exec select $db $statement_name $sql 3]
 
   upvar $opts(uplevel) $result_name rows
 
@@ -405,11 +390,9 @@
     @param sql Query to use when processing this command
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
-
   upvar opts opts
 
-  uplevel "db_exec dml $db $full_statement_name \"$sql\""
+  db_exec dml $db $statement_name "$sql" 3
 }
 
 # @private get_cached_result
@@ -533,11 +516,8 @@
     @param body Code body to be execute for each result row of the returned query
 } {
 
-  set full_statement_name [db_qd_get_fullname $statement_name]
+  set result [db_exec select $db $statement_name $sql 3]
 
-  uplevel "set __result \[db_exec select $db $full_statement_name $sql\]"
-  upvar __result result
-
   set rowcount 0
 
   while { [ns_db getrow $db $result] } {