Index: openacs-4/packages/xotcl-core/xotcl-core.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/xotcl-core.info,v diff -u -r1.26 -r1.27 --- openacs-4/packages/xotcl-core/xotcl-core.info 16 Apr 2007 09:52:56 -0000 1.26 +++ openacs-4/packages/xotcl-core/xotcl-core.info 2 May 2007 09:54:51 -0000 1.27 @@ -8,10 +8,10 @@ t xotcl - + Gustaf Neumann XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes) - 2007-04-16 + 2007-05-02 This component contains some core functionality for OACS applications using XOTcl. It includes XOTcl thread handling for OACS (supporting persistent and @@ -33,11 +33,12 @@ 0.45: xo:db require operations; 0.48: policies 0.49: stored procedures object proxies (postgres and Oracle) +0.51: require package BSD-Style 0 - + 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 -r1.12 -r1.13 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 16 Apr 2007 11:09:12 -0000 1.12 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 2 May 2007 09:54:52 -0000 1.13 @@ -156,6 +156,10 @@ # but will not work, when a single openacs instance want to talk to # postgres and oracle simultaneously. Not sure, how important this is... # + if {$object_name eq "set"} { + my log "We cannot handle object_name = '$object_name' in this version" + return + } set package_name [namespace tail [self]] set statement_name [my qn $package_name-$object_name] set sql_command [my psql-[db_driverkey ""] $package_name $object_name $statement_name] @@ -168,6 +172,7 @@ set nonposarg_name [expr {$arg_name eq "DBN" ? "DBN" : [string tolower $arg_name]}] lappend nonposarg_list -$nonposarg_name$required } + #my log "-- define $object_name $nonposarg_list" my ad_proc $object_name $nonposarg_list {} [subst -novariables { #defined: [my array get defined] @@ -240,6 +245,15 @@ } } + require proc package name { + if {[info command ::${name}::*] eq ""} { + set dir [ns_info tcllib]/../packages/$name + foreach file [glob $dir/tcl/*-procs.tcl] { + uplevel #1 source $file + } + } + } + ad_proc has_ltree {} { Check, whether ltree is available (postgres only) } { 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.15 -r1.16 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 17 Apr 2007 08:40:15 -0000 1.15 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 2 May 2007 09:54:52 -0000 1.16 @@ -200,7 +200,7 @@ } ConnectionContext instproc returnredirect {url} { - my log "--rp" + #my log "--rp" my set __continuation [list ad_returnredirect $url] return "" } @@ -394,6 +394,7 @@ id url package_url + package_key instance_name } Package instforward query_parameter ::xo::cc %proc @@ -422,6 +423,7 @@ } #my log "--R package_url= $package_url (was $info(url))" my package_url $package_url + my package_key $info(package_key) my instance_name $info(instance_name) if {[my exists url] && [info exists root]} { regexp "^${root}(.*)$" $url _ url @@ -436,7 +438,7 @@ Package instproc set_url {-url} { my url $url my set object [string range [my url] [string length [my package_url]] end] - #my log "--R object set to [my set object]" + #my log "--R object set to [my set object], [my serialize]" } # Package instproc destroy {} {