Index: openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl,v diff -u -r1.93.2.3 -r1.93.2.4 --- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 30 Apr 2019 18:50:10 -0000 1.93.2.3 +++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 23 Jul 2019 16:51:49 -0000 1.93.2.4 @@ -464,7 +464,7 @@ #proc ::xo::at_create {} { # ns_log notice "--at_create *********" # foreach i [::xo::InstanceManager array names blueprint] { - # if {![::xotcl::Object isobject $i]} { + # if {![nsf::is object $i]} { # ::xo::InstanceManager unset blueprint($i) # ns_log notice "--at_create no such object: $i" # } @@ -483,7 +483,7 @@ set at_end "" foreach {name cmd} [array get ::xo::cleanup] { #::trace remove variable ::xotcl_cleanup($name) unset ::xo::cleanup - if {![::xotcl::Object isobject $name]} { + if {![nsf::is object $name]} { #ns_log notice "--D $name already destroyed, nothing to do" continue } @@ -499,7 +499,7 @@ ns_log error "Error during ::xo::cleanup: $errorMsg $::errorInfo" try { ns_log notice "... analyze: cmd = $cmd" - ns_log notice "... analyze: $obj is_object? [::xotcl::Object isobject $obj]" + ns_log notice "... analyze: $obj is_object? [nsf::is object $obj]" ns_log notice "... analyze: class [$obj info class]" ns_log notice "... analyze: precedence [$obj info precedence]" ns_log notice "... analyze: methods [lsort [$obj info methods]]" @@ -565,12 +565,12 @@ set objs [::xotcl::Object allinstances] ns_log notice "no finalize available, deleting [llength $objs] objects" foreach o $objs { - if {![::xotcl::Object isobject $o]} continue + if {![nsf::is object $o]} continue if {[$o istype ::xotcl::Class]} continue catch {$o destroy} errorMsg } foreach o [::xotcl::Class allinstances] { - if {![::xotcl::Object isobject $o]} continue + if {![nsf::is object $o]} continue if {$o eq "::xotcl::Object" || $o eq "::xotcl::Class"} continue catch {$o destroy} errorMsg } @@ -1002,7 +1002,7 @@ # search for slot foreach c [:info heritage] { - if {[info commands ${c}::slot::$name] ne ""} { + if {[nsf::is object ${c}::slot::$name]} { set slot ${c}::slot::$name break } 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.148.2.11 -r1.148.2.12 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 4 Jul 2019 18:07:48 -0000 1.148.2.11 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 23 Jul 2019 16:51:49 -0000 1.148.2.12 @@ -1690,7 +1690,7 @@ } set class_name ::xo::db::sql::[string tolower $package_name] - if {![:isobject $class_name]} { + if {![nsf::is object $class_name]} { ::xo::db::Class create $class_name } elseif {![$class_name istype ::xo::db::Class]} { # @@ -1751,7 +1751,7 @@ # Installations with acs-kernel prior to 5.8.1a6 (or later, before running upgrade script) # won't have these procs. We define them here if missing to avoid breaking running instances during transition. - if {![::xotcl::Class isobject "::xo::db::sql::util"]} { + if {![nsf::is object "::xo::db::sql::util"]} { ::xotcl::Class create ::xo::db::sql::util if {[::xo::db::sql::util info commands table_exists] eq ""} { ::xo::db::sql::util ad_proc table_exists {-name:required} {Transitional method} { Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v diff -u -r1.41.2.5 -r1.41.2.6 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 4 Jul 2019 18:11:46 -0000 1.41.2.5 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 23 Jul 2019 16:51:49 -0000 1.41.2.6 @@ -173,9 +173,9 @@ error "package_id must not be empty" } - #:log "--R $package_id exists? [:isobject ::$package_id] url='$url'" + #:log "--R $package_id exists? [nsf::is object ::$package_id] url='$url'" - if {![:isobject ::$package_id]} { + if {![nsf::is object ::$package_id]} { #:log "--R we have to create ::$package_id //url='$url'" # # To make initialization code generic, we obtain from the Index: openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl,v diff -u -r1.27.2.3 -r1.27.2.4 --- openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 8 May 2019 14:30:45 -0000 1.27.2.3 +++ openacs-4/packages/xotcl-core/tcl/20-Ordered-Composite-procs.tcl 23 Jul 2019 16:54:51 -0000 1.27.2.4 @@ -80,7 +80,7 @@ if {[info exists :__children]} { #:log "--W destroying children ${:__children}" foreach c ${:__children} { - if {[:isobject $c]} {$c destroy} + if {[nsf::is object $c]} {$c destroy} } } #show_stack;:log "--W children murdered, now next, chlds=[:info children]" Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v diff -u -r1.70.2.4 -r1.70.2.5 --- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 4 Jul 2019 18:08:53 -0000 1.70.2.4 +++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 23 Jul 2019 16:54:51 -0000 1.70.2.5 @@ -692,8 +692,8 @@ } TABLE instproc render {} { - if {![:isobject [self]::__actions]} {:actions {}} - if {![:isobject [self]::__bulkactions]} {:bulkactions {}} + if {![nsf::is object [self]::__actions]} {:actions {}} + if {![nsf::is object [self]::__bulkactions]} {:bulkactions {}} set bulkactions [[self]::__bulkactions children] if {$bulkactions eq ""} { html::table -class ${:css.table-class} { @@ -876,8 +876,8 @@ } } \ -instproc render {} { - if {![:isobject [self]::__actions]} {:actions {}} - if {![:isobject [self]::__bulkactions]} {:__bulkactions {}} + if {![nsf::is object [self]::__actions]} {:actions {}} + if {![nsf::is object [self]::__bulkactions]} {:__bulkactions {}} set bulkactions [[self]::__bulkactions children] html::div { :render-actions Index: openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl,v diff -u -r1.68.2.9 -r1.68.2.10 --- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 23 Jul 2019 12:35:29 -0000 1.68.2.9 +++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 23 Jul 2019 16:56:01 -0000 1.68.2.10 @@ -537,7 +537,7 @@ #ns_log notice "expires-set $filename" #ns_log notice "status_code = $status_code, filename=$filename" - if {![:isobject ::xo::cc]} { + if {![nsf::is object ::xo::cc]} { ::xo::ConnectionContext require } set query [::xo::cc actual_query] @@ -750,7 +750,7 @@ } { if {$query eq ""} { - if {![::xotcl::Object isobject ::xo::cc]} { + if {![nsf::is object ::xo::cc]} { ::xo::ConnectionContext require } set query [::xo::cc actual_query] 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.75.2.4 -r1.75.2.5 --- openacs-4/packages/xotcl-core/tcl/context-procs.tcl 4 Jul 2019 18:09:42 -0000 1.75.2.4 +++ openacs-4/packages/xotcl-core/tcl/context-procs.tcl 23 Jul 2019 16:56:01 -0000 1.75.2.5 @@ -227,7 +227,7 @@ {-actual_query " "} {-keep_cc false} } { - set exists_cc [:isobject ::xo::cc] + set exists_cc [nsf::is object ::xo::cc] # if we have a connection context and we want to keep it, do # nothing and return. Index: openacs-4/packages/xotcl-core/tcl/cr-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/cr-procs.tcl,v diff -u -r1.76.2.20 -r1.76.2.21 --- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 17 Jul 2019 11:46:23 -0000 1.76.2.20 +++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 23 Jul 2019 16:56:01 -0000 1.76.2.21 @@ -103,7 +103,7 @@ @return parent_id } { # TODO: the following line is deactivated, until we get rid of the "folder object" in xowiki - #if {[:isobject ::$item_id]} {return [::$item_id parent_id]} + #if {[nsf::is object ::$item_id]} {return [::$item_id parent_id]} ::xo::dc 1row -prepare integer get_parent "select parent_id from cr_items where item_id = :item_id" return $parent_id } @@ -118,7 +118,7 @@ @return parent_id } { # TODO: the following line is deactivated, until we get rid of the "folder object" in xowiki - #if {[:isobject ::$item_id]} {return [::$item_id parent_id]} + #if {[nsf::is object ::$item_id]} {return [::$item_id parent_id]} ::xo::dc 1row -prepare integer get_name "select name from cr_items where item_id = :item_id" return $name } @@ -435,7 +435,7 @@ @return cr item object } { # :log "-- generic fetch_object [self args]" - if {![::xotcl::Object isobject $object]} { + if {![nsf::is object $object]} { # if the object does not yet exist, we have to create it :create $object } @@ -549,7 +549,7 @@ @return fully qualified object } { set object ::[expr {$revision_id ? $revision_id : $item_id}] - if {![:isobject $object]} { + if {![nsf::is object $object]} { :fetch_object -object $object \ -item_id $item_id -revision_id $revision_id \ -initialize $initialize @@ -916,7 +916,7 @@ } CrItem instproc current_user_id {} { - if {[:isobject ::xo::cc]} {return [::xo::cc user_id]} + if {[nsf::is object ::xo::cc]} {return [::xo::cc user_id]} if {[ad_conn isconnected]} {return [ad_conn user_id]} return "" } @@ -1517,7 +1517,7 @@ "standard naming convention". Instead we create them as ::cr_folder } { set object ::$item_id - if {![:isobject $object]} { + if {![nsf::is object $object]} { :fetch_object -object $object -item_id $item_id -initialize $initialize $object destroy_on_cleanup } @@ -1551,7 +1551,7 @@ all attributes. The revision_id is completely ignored. @see CrClass fetch_object } { - if {![::xotcl::Object isobject $object]} { + if {![nsf::is object $object]} { :create $object } @@ -1577,7 +1577,7 @@ -creation_user $creation_user \ -creation_ip $creation_ip] #parent_s has_child_folders attribute could have become outdated - if { [:isobject ::${:parent_id}] } { + if { [nsf::is object ::${:parent_id}] } { ::${:parent_id} set has_child_folders t } # well, obtaining the allowed content_types this way is not very @@ -1654,7 +1654,7 @@ # The variable serialized_object contains the serialization of # the object from the cache; check if the object exists already # or create it. - if {[:isobject $object]} { + if {[nsf::is object $object]} { # There would have been no need to call this method. We could # raise an error here. # :log "--!! $object exists already" 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.112.2.2 -r1.112.2.3 --- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 4 Jul 2019 18:10:50 -0000 1.112.2.2 +++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 23 Jul 2019 16:56:01 -0000 1.112.2.3 @@ -120,7 +120,7 @@ } Form instproc request {privilege} { - if {[:isobject ::${:package_id}] && ![::${:package_id} exists policy]} { + if {[nsf::is object ::${:package_id}] && ![::${:package_id} exists policy]} { # not needed, if governed by a policy auth::require_login permission::require_permission \ Index: openacs-4/packages/xotcl-core/tcl/policy-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/policy-procs.tcl,v diff -u -r1.29.2.2 -r1.29.2.3 --- openacs-4/packages/xotcl-core/tcl/policy-procs.tcl 4 Jul 2019 18:11:46 -0000 1.29.2.2 +++ openacs-4/packages/xotcl-core/tcl/policy-procs.tcl 23 Jul 2019 16:56:53 -0000 1.29.2.3 @@ -100,9 +100,9 @@ set permission "" set o [self]::[namespace tail $object] set key require_permission($method) - if {[:isobject $o] && [$o exists $key]} { + if {[nsf::is object $o] && [$o exists $key]} { set permission [$o set $key] - } elseif {[:isobject $o] && [$o exists default_permission]} { + } elseif {[nsf::is object $o] && [$o exists default_permission]} { set permission [$o set default_permission] } elseif {$check_classes} { # we have no object specific policy information, check the classes Index: openacs-4/packages/xotcl-core/tcl/test/xotcl-core-db-tutorial-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/test/xotcl-core-db-tutorial-procs.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/xotcl-core/tcl/test/xotcl-core-db-tutorial-procs.tcl 20 Mar 2019 20:48:48 -0000 1.1.2.1 +++ openacs-4/packages/xotcl-core/tcl/test/xotcl-core-db-tutorial-procs.tcl 23 Jul 2019 16:56:53 -0000 1.1.2.2 @@ -19,14 +19,14 @@ set id [$o object_id] aa_true "'$o' has a matching object_id" [regexp "^::$id\$" $o] - aa_true "$o is an abject" [::xotcl::Object isobject $o] + aa_true "$o is an abject" [nsf::is object $o] $o destroy - aa_false "$o is not an abject anymore" [::xotcl::Object isobject $o] + aa_false "$o is not an abject anymore" [nsf::is object $o] # Load the persisted object from the DB set o [::xo::db::Class get_instance_from_db -id $id] - aa_true "$o is again an abject" [::xotcl::Object isobject $o] + aa_true "$o is again an abject" [nsf::is object $o] # Check, of object exists in the DB aa_true "$o exists in the DB" [::xo::db::Class exists_in_db -id $id] @@ -86,7 +86,7 @@ aa_true "'$p' looks like a valid object name" [regexp {^::\d+$} $p] - aa_true "object $p exists in memory" [::xotcl::Object isobject $p] + aa_true "object $p exists in memory" [nsf::is object $p] set id [$p object_id] aa_true "bject $p exists in the db" [::xo::db::Class exists_in_db -id $id]