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.106.2.19 -r1.106.2.20 --- openacs-4/packages/xotcl-core/xotcl-core.info 6 Jun 2020 10:04:26 -0000 1.106.2.19 +++ openacs-4/packages/xotcl-core/xotcl-core.info 14 Jul 2020 19:43:09 -0000 1.106.2.20 @@ -10,7 +10,7 @@ t xotcl - + Gustaf Neumann XOTcl library functionality (e.g. thread handling, online documentation, Generic Form and List Classes) 2017-08-06 @@ -42,12 +42,12 @@ BSD-Style 2 - + - + 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.19 -r1.93.2.20 --- openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 2 Jul 2020 08:31:17 -0000 1.93.2.19 +++ openacs-4/packages/xotcl-core/tcl/01-debug-procs.tcl 14 Jul 2020 19:43:09 -0000 1.93.2.20 @@ -681,7 +681,7 @@ ::xo::system_stats proc thread_info {pid tid} { set s "" set fn /proc/$pid/task/$tid/stat - if {[file readable $fn]} { + if {[ad_file readable $fn]} { try { set f [open $fn] set s [read $f] 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.21 -r1.148.2.22 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 2 Jul 2020 08:31:17 -0000 1.148.2.21 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 14 Jul 2020 19:43:09 -0000 1.148.2.22 @@ -1023,7 +1023,7 @@ } } - if {[file readable $sql_file]} { + if {[ad_file readable $sql_file]} { :log "Sourcing '$sql_file'" db_source_sql_file $sql_file ::xo::db::Class create_all_functions 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.24 -r1.41.2.25 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 18 May 2020 21:20:20 -0000 1.41.2.24 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 14 Jul 2020 19:43:09 -0000 1.41.2.25 @@ -119,7 +119,7 @@ set page "" set fn [:prototype_page_file_name -name $name -package_key $package_key] #:log "--W check $fn" - if {![file readable $fn]} { + if {![ad_file readable $fn]} { ns_log notice "no such prototype page $fn" } else { # @@ -292,7 +292,7 @@ set existing_page [::xo::db::CrClass get_instance_from_db -item_id $item_id] set fn [:prototype_page_file_name -name $n -package_key ${:package_key}] set time [clock scan [::xo::db::tcl_date [::$item_id last_modified] tz_var]] - if {[file mtime $fn] > $time} { + if {[ad_file mtime $fn] > $time} { set refetch_this_page true } ns_log notice "page $n: prototype file is [expr {$refetch_this_page ? {NEWER} : {OLDER}}]" 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.12 -r1.68.2.13 --- openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 2 Jul 2020 08:31:17 -0000 1.68.2.12 +++ openacs-4/packages/xotcl-core/tcl/bgdelivery-procs.tcl 14 Jul 2020 19:43:09 -0000 1.68.2.13 @@ -581,10 +581,10 @@ set size [h264length $handle] h264close $handle } else { - set size [file size $filename] + set size [ad_file size $filename] } } else { - set size [file size $filename] + set size [ad_file size $filename] } # Make sure to set "connection close" for the requests (in other 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.32 -r1.76.2.33 --- openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 26 May 2020 22:21:35 -0000 1.76.2.32 +++ openacs-4/packages/xotcl-core/tcl/cr-procs.tcl 14 Jul 2020 19:43:09 -0000 1.76.2.33 @@ -814,7 +814,7 @@ # } if {$storage_type eq "file"} { ::xo::dc dml fix_content_length "update cr_revisions \ - set content_length = [file size ${:import_file}] \ + set content_length = [ad_file size ${:import_file}] \ where revision_id = :revision_id" } } @@ -878,7 +878,7 @@ [:info class] instvar storage_type if {$storage_type eq "file"} { ::xo::dc dml fix_content_length "update cr_revisions \ - set content_length = [file size ${:import_file}] \ + set content_length = [ad_file size ${:import_file}] \ where revision_id = :revision_id" } elseif {$storage_type eq "text"} { ::xo::dc dml fix_content "update cr_revisions \ Index: openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl 23 Jul 2019 17:06:23 -0000 1.6.2.1 +++ openacs-4/packages/xotcl-core/tcl/install-check-procs.tcl 14 Jul 2020 19:43:09 -0000 1.6.2.2 @@ -38,7 +38,7 @@ tcl/10-recreation-procs.tcl-old tcl/thread_mod-procs.tcl } { - if {[file exists $dir/$file]} { + if {[ad_file exists $dir/$file]} { ns_log notice "Deleting obsolete file $dir/$file" file delete -- $dir/$file } Index: openacs-4/packages/xowf/xowf.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v diff -u -r1.12.2.16 -r1.12.2.17 --- openacs-4/packages/xowf/xowf.info 17 Jun 2020 21:59:50 -0000 1.12.2.16 +++ openacs-4/packages/xowf/xowf.info 14 Jul 2020 19:38:53 -0000 1.12.2.17 @@ -10,17 +10,17 @@ t xowf - + Gustaf Neumann XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms 2017-08-06 WU Vienna 2 - + - + Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v diff -u -r1.28.2.34 -r1.28.2.35 --- openacs-4/packages/xowf/tcl/xowf-procs.tcl 10 Jul 2020 10:39:32 -0000 1.28.2.34 +++ openacs-4/packages/xowf/tcl/xowf-procs.tcl 14 Jul 2020 19:38:53 -0000 1.28.2.35 @@ -644,7 +644,7 @@ if {[${:wf_container} exists __xowf_depends]} { set depends [${:wf_container} set __xowf_depends] foreach {fn mtime} $depends { - if {[file mtime $fn] ne $mtime} { + if {[ad_file mtime $fn] ne $mtime} { set ok 0 break } @@ -2405,7 +2405,7 @@ } set fname [acs_root_dir]$wfName - if {![file readable $fname]} { + if {![ad_file readable $fname]} { error "file '$fname' not found" } @@ -2414,7 +2414,7 @@ # invocation. It would be nicer to have this more OO, such we can # avoid the global variable ::__xowf_depends. # - lappend ::__xowf_depends $fname [file mtime $fname] + lappend ::__xowf_depends $fname [ad_file mtime $fname] set f [open $fname]; set wfDefinition [read $f]; close $f #::xotcl::Object log "INCLUDE $wfName [list $vars]"