Index: openacs-4/packages/xotcl-core/tcl/context-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/context-procs.tcl,v diff -u -r1.63.2.3 -r1.63.2.4 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 11 Feb 2014 11:53:08 -0000 1.63.2.3 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 14 Feb 2014 17:52:52 -0000 1.63.2.4 @@ -47,7 +47,7 @@ } if {$actual_query eq " "} { if {[ns_conn isconnected]} { - set actual_query [ns_conn query] + set actual_query [ns_conn query] } #my log "--CONN ns_conn query = <$actual_query>" } @@ -76,21 +76,21 @@ # get the query parameters (from the form if necessary) if {[my istype ::xo::ConnectionContext]} { foreach param [array names ""] { - #my log "--cc check $param [info exists passed_args($param)]" - set name [string range $param 1 end] - if {![info exists passed_args($param)] && - [my exists_form_parameter $name]} { - #my log "--cc adding passed_args(-$name) [my form_parameter $name]" - set passed_args($param) [my form_parameter $name] - } + #my log "--cc check $param [info exists passed_args($param)]" + set name [string range $param 1 end] + if {![info exists passed_args($param)] && + [my exists_form_parameter $name]} { + #my log "--cc adding passed_args(-$name) [my form_parameter $name]" + set passed_args($param) [my form_parameter $name] + } } } # get the caller parameters (e.g. from the includelet call) if {[info exists caller_parameters]} { #my log "--cc caller_parameters=$caller_parameters" array set caller_param $caller_parameters - + foreach param [array names caller_param] { if {[info exists ($param)]} { set passed_args($param) $caller_param($param) @@ -211,13 +211,13 @@ } ConnectionContext proc require { - -url - {-package_id 0} - {-parameter ""} - {-user_id -1} - {-actual_query " "} - {-keep_cc false} - } { + -url + {-package_id 0} + {-parameter ""} + {-user_id -1} + {-actual_query " "} + {-keep_cc false} + } { set exists_cc [my isobject ::xo::cc] # if we have a connection context and we want to keep it, do @@ -252,8 +252,8 @@ my create ::xo::cc \ -package_id $package_id \ [list -parameter_declaration $parameter] \ - -user_id $user_id \ - -actual_query $actual_query \ + -user_id $user_id \ + -actual_query $actual_query \ -locale $locale \ -url $url #::xo::show_stack @@ -263,7 +263,7 @@ #my msg "--cc ::xo::cc reused $url -package_id $package_id" ::xo::cc configure \ -url $url \ - -actual_query $actual_query \ + -actual_query $actual_query \ -locale $locale \ [list -parameter_declaration $parameter] #if {$package_id ne ""} { @@ -300,13 +300,13 @@ } else { my set user_id 0 my set untrusted_user_id 0 - array set ::ad_conn [list user_id $user_id untrusted_user_id $user_id session_id ""] + array set ::ad_conn [list user_id $user_id untrusted_user_id $user_id session_id ""] } } else { my set user_id $user_id my set untrusted_user_id $user_id if {![info exists ::ad_conn(user_id)]} { - array set ::ad_conn [list user_id $user_id untrusted_user_id $user_id session_id ""] + array set ::ad_conn [list user_id $user_id untrusted_user_id $user_id session_id ""] } } } @@ -459,11 +459,11 @@ #my set $key } -# ConnectionContext instproc destroy {} { -# my log "--i destroy [my url]" -# #::xo::show_stack -# next -# } + # ConnectionContext instproc destroy {} { + # my log "--i destroy [my url]" + # #::xo::show_stack + # next + # } ConnectionContext instproc load_form_parameter {} {