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.4 -r1.5 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 6 Apr 2007 13:13:09 -0000 1.4 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 6 Apr 2007 21:51:32 -0000 1.5 @@ -97,14 +97,14 @@ if {$n} { my log "sql=$sql_command" } else { - #my log "sql=$sql_command" + my log "sql=$sql_command" eval $sql_command } }] } DbPackage instproc unknown {m args} { - my log "Error: unknown database method $m" + error "Error: unknown database method $m for dbpackage [self]" } DbPackage proc create_all_functions {} { 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.12 -r1.13 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 6 Apr 2007 13:13:09 -0000 1.12 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 6 Apr 2007 21:51:32 -0000 1.13 @@ -178,8 +178,8 @@ -user_id $user_id \ -actual_query $actual_query \ -url $url - #my log "--cc ::xo::cc created $url" - ::xo::cc destroy_on_cleanup + #my msg "--cc ::xo::cc created $url [::xo::cc serialize]" + ::xo::cc destroy_on_cleanup } else { #my log "--cc ::xo::cc reused $url" ::xo::cc configure \ Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v diff -u -r1.49 -r1.50 --- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 6 Apr 2007 13:13:09 -0000 1.49 +++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 6 Apr 2007 21:51:32 -0000 1.50 @@ -167,7 +167,7 @@ #::xo::db::call psql content_folder ${operation}_content_type { # folder_id {content_type $object_type} {include_subtypes t} #} - ::xo::db::CONTENT_FOLDER ${operation}_content_type { + ::xo::db::CONTENT_FOLDER ${operation}_CONTENT_TYPE { folder_id {content_type $object_type} {include_subtypes t} } } @@ -201,11 +201,11 @@ $att instvar attribute_name datatype pretty_name sqltype # ::xo::db::call psql content_type create_attribute { # {content_type $object_type} attribute_name datatype -# pretty_name {column_spec sqltype} +# pretty_name {column_spec $sqltype} # } ::xo::db::CONTENT_TYPE CREATE_ATTRIBUTE { {content_type $object_type} attribute_name datatype - pretty_name {column_spec sqltype} + pretty_name {column_spec $sqltype} } } } @@ -760,7 +760,7 @@ db_transaction { $__class instvar storage_type object_type $__class folder_type -folder_id $parent_id register - my lock acs_objects "SHARE ROW EXCLUSIVE" + [self class] lock acs_objects "SHARE ROW EXCLUSIVE" set revision_id [db_nextval acs_object_id_seq] if {$name eq ""} {