Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v diff -u -N -r1.123 -r1.124 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 17 May 2018 07:39:03 -0000 1.123 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 20 May 2018 11:23:00 -0000 1.124 @@ -158,7 +158,7 @@ # # finally, there might be a view with a nextval # - ns_log debug "db_nextval: sequence($sequence) is not a real sequence. perhaps it uses the view hack." + ns_log debug "db_nextval: sequence($sequence) is not a real sequence. Perhaps it uses the view hack." set nextval [::xo::dc get_value nextval "select nextval from :sequence"] } return $nextval @@ -1340,7 +1340,7 @@ # # The generation of the code interface code is driver specific, since - # e.q. dbi supports option "-autonull", which simplified the + # e.g. dbi supports option "-autonull", which simplified the # interface code significantly # @@ -1625,7 +1625,7 @@ lappend nonposarg_list $arg } # When the new method is executed within a contains, -childof is - # appended. we have to added it here to avoid complains. xotcl 2.0 + # appended. We have to added it here to avoid complains. Xotcl 2.0 # should find better ways to handle contain or the new invocation. if {$object_name eq "new"} {lappend nonposarg_list -childof} #:log "-- define $object_name $nonposarg_list" Index: openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl 30 Apr 2018 09:46:43 -0000 1.22 +++ openacs-4/packages/xotcl-core/tcl/06-param-procs.tcl 20 May 2018 11:23:00 -0000 1.23 @@ -236,7 +236,7 @@ } } # - # if everything fails, return empty + # If everything fails, return empty. # return "" } @@ -267,8 +267,10 @@ {-retry true} } { if {![info exists package_id]} { - # try to get the package id; - # if everything fails, use kernel_id (to be compatible with trad. parameter::get) + # + # Try to get the package id; if everything fails, use kernel_id + # (to be compatible with traditional parameter::get) + # set package_id [expr {[info commands ::xo::cc] ne "" ? [::xo::cc package_id] : [ns_conn isconnected] ? [ad_conn package_id] : [ad_acs_kernel_id]}] 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 -N -r1.72 -r1.73 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 30 Apr 2018 09:46:44 -0000 1.72 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 20 May 2018 11:23:00 -0000 1.73 @@ -165,8 +165,10 @@ $source instvar __caller_parameters if {![info exists :__including_page]} { - # a includelet is called from the toplevel. the actual_query might - # be cached, so we reset it here. + # + # An includelet is called from the toplevel. The actual_query + # might be cached, so we reset it here. + # set :actual_query [::xo::cc actual_query] } Index: openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl,v diff -u -N -r1.35 -r1.36 --- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 24 Mar 2018 16:21:19 -0000 1.35 +++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 20 May 2018 11:23:00 -0000 1.36 @@ -213,8 +213,8 @@ # the sense of http://www.iana.org/assignments/character-sets) is # provided by ... # - # i. a static, built-in correspondence map: see nsd/encoding.c - # ii. an extensible correspondence map (i.e., the ns/charsets + # i. A static, built-in correspondence map: see nsd/encoding.c + # ii. An extensible correspondence map (i.e., the ns/charsets # section in config.tcl). # # For mapping charset to encoding names, I use @@ -225,8 +225,8 @@ # issues (non-extensibility from standard configuration sites, # incompleteness, redundant thread-local storing, scripted # implementation): - # 1. tcllib/mime package: ::mime::reversemapencoding() - # 2. tdom: tDOM::IANAEncoding2TclEncoding(); see lib/tdom.tcl + # 1. Tcllib/mime package: ::mime::reversemapencoding() + # 2. Tdom: tDOM::IANAEncoding2TclEncoding(); see lib/tdom.tcl # # RFC 3023 support (at least in my reading) demands the following