Index: openacs-4/packages/acs-content-repository/tcl/doc-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/tcl/doc-procs-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-content-repository/tcl/doc-procs-oracle.xql 27 Apr 2001 02:27:09 -0000 1.1 +++ openacs-4/packages/acs-content-repository/tcl/doc-procs-oracle.xql 10 May 2001 05:38:11 -0000 1.2 @@ -51,7 +51,7 @@ or lower(text) like '%function%' ) - order by line_header" + order by line_header @@ -72,7 +72,7 @@ or lower(text) like '%function%' ) - order by line_header" -eval { + order by line_header Index: openacs-4/packages/acs-tcl/tcl/00-database-procs-oracle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/00-database-procs-oracle.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-tcl/tcl/00-database-procs-oracle.tcl 9 May 2001 22:32:25 -0000 1.3 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs-oracle.tcl 10 May 2001 05:38:11 -0000 1.4 @@ -39,14 +39,14 @@ # Right now, use :1 as the output value if it occurs in the statement, # or not otherwise. if { [regexp {:1} $sql] } { - return [db_exec exec_plsql_bind $db $full_statement_name $sql 1 ""] + return [db_exec exec_plsql_bind $db $full_statement_name $sql 2 1 ""] } else { return [db_exec dml $db $full_statement_name $sql] } } } -ad_proc -private db_exec { type db statement_name pre_sql args } { +ad_proc -private db_exec { type db statement_name pre_sql {ulevel 2} args } { A helper procedure to execute a SQL statement, potentially binding depending on the value of the $bind variable in the calling environment @@ -62,7 +62,7 @@ # insert tcl variable values (Openacs - Dan) if {![string equal $sql $pre_sql]} { - set sql [uplevel 2 [list subst -nobackslashes $sql]] + set sql [uplevel $ulevel [list subst -nobackslashes $sql]] } ns_log Notice "POST-QD: the SQL is $sql" @@ -80,7 +80,7 @@ return [eval [list ns_ora $type $db -bind $bind_vars $sql] $args] } } else { - return [uplevel 2 [list ns_ora $type $db $sql] $args] + return [uplevel $ulevel [list ns_ora $type $db $sql] $args] } } error] @@ -136,7 +136,7 @@ for { set i 1 } { $i <= [llength $lob_argv] } { incr i } { lappend bind_vars $i } - eval [list db_exec "${command}_bind" $db $full_statement_name $sql $bind_vars] $lob_argv + eval [list db_exec "${command}_bind" $db $full_statement_name $sql 2 $bind_vars] $lob_argv } else { eval [list db_exec $command $db $full_statement_name $sql] $lob_argv } @@ -186,7 +186,7 @@ set full_statement_name [db_qd_get_fullname $statement_name] db_with_handle db { - eval [list db_exec blob_get_file $db $full_statement_name $sql $file] $args + eval [list db_exec blob_get_file $db $full_statement_name $sql 2 $file] $args } }