Index: openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl,v diff -u -r1.66.2.13 -r1.66.2.14 --- openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 21 Nov 2020 17:39:16 -0000 1.66.2.13 +++ openacs-4/packages/acs-bootstrap-installer/tcl/00-proc-procs.tcl 14 Feb 2021 21:08:02 -0000 1.66.2.14 @@ -1182,6 +1182,15 @@ ::file $subcmd $arg1 {*}$args } +# if {[cmd_exists xxx]} +if {[info commands ::nsf::cmd::info ] ne ""} { + interp alias {} cmd_exists {} ::nsf::cmd::info exists +} else { + ad_proc -private cmd_exists {cmd} { + expr {[::namespace which $cmd] ne ""} + } +} + # Local variables: # mode: tcl # tcl-indent-level: 4 Index: openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl,v diff -u -r1.50.2.3 -r1.50.2.4 --- openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 28 Oct 2020 15:39:19 -0000 1.50.2.3 +++ openacs-4/packages/acs-bootstrap-installer/tcl/30-apm-load-procs.tcl 14 Feb 2021 21:08:02 -0000 1.50.2.4 @@ -121,11 +121,15 @@ set type "template" } elseif { [llength $components] == 1 && ($extension eq ".html" || $extension eq ".adp") } { - # HTML or ADP file in the top level of a package - assume it's documentation. + # + # HTML or ADP file in the top level of a package - assume it + # is documentation. + # set type "documentation" - # RBM: Changed the next elseif to check for 'www' or 'admin-www' only n levels down - # the path, since that'd be the minimum in a path counting from the pageroot + # RBM: Changed the next elseif to check for 'www' or + # 'admin-www' only n levels down the path, since that'd be the + # minimum in a path counting from the pageroot } elseif { "www" in $components_lesser || "admin-www" in $components_lesser } { set type "content_page" Index: openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl,v diff -u -r1.49.2.3 -r1.49.2.4 --- openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 28 Oct 2020 15:39:19 -0000 1.49.2.3 +++ openacs-4/packages/acs-bootstrap-installer/tcl/40-db-query-dispatcher-procs.tcl 14 Feb 2021 21:08:02 -0000 1.49.2.4 @@ -6,13 +6,13 @@ # The Query Dispatcher is documented at http://openacs.org/ # The Query Dispatcher needs tDOM (http://tdom.org) to work. -# This doesn't use the ad_proc construct, or any significant aD constructs, -# because we want this piece to be usable in a separate context. While this makes -# the coding somewhat more complicated, it's still easy to document and write clear, -# virgin Tcl code. +# This doesn't use the ad_proc construct, or any significant aD +# constructs, because we want this piece to be usable in a separate +# context. While this makes the coding somewhat more complicated, it +# is still easy to document and write clear, virgin Tcl code. +# - # The following code allows ad_proc to be used # here (a local workalike is declared if absent). # added 2002-09-11 Jeff Davis (davis@xarg.net) @@ -592,7 +592,7 @@ Store in Cache. The load_location is the file where this query was found. } { - # Check if it's compatible at all! + # Check if it is compatible at all! set rdbms [db_fullquery_get_rdbms $fullquery] if {![db_rdbms_compatible_p $rdbms [db_current_rdbms]]} { # The query isn't compatible, probably because of a too high version @@ -678,7 +678,7 @@ # Get the list of queries out set root_node [xml_doc_get_first_node $parsed_doc] - # Check that it's a queryset + # Check if the node is a queryset if {[xml_node_get_name $root_node] ne "queryset"} { # db_qd_log Error "OH OH, error, first node is [xml_node_get_name $root_node] and not 'queryset'" return "" @@ -768,8 +768,10 @@ ad_proc -private db_rdbms_parse_from_xml_node {rdbms_node} { Parse and RDBMS struct from an XML fragment node -} { - # Check that it's RDBMS +} { + # + # Check if the DOM node refers to a RDBMS. + # if {[xml_node_get_name $rdbms_node] ne "rdbms"} { db_qd_log Debug "db_rdbms_parse_from_xml_node: PARSER = BAD RDBMS NODE!" return {} Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.57.2.3 -r1.57.2.4 --- openacs-4/packages/forums/www/message-view.tcl 26 Sep 2020 12:10:23 -0000 1.57.2.3 +++ openacs-4/packages/forums/www/message-view.tcl 14 Feb 2021 21:17:57 -0000 1.57.2.4 @@ -47,7 +47,7 @@ ############################################ # -# Ok we're not aborting so lets do some work +# Ok we're not aborting so let's do some work # ############################################ Index: openacs-4/packages/news/tcl/test/news-db-test-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/test/news-db-test-init.tcl,v diff -u -r1.18.2.3 -r1.18.2.4 --- openacs-4/packages/news/tcl/test/news-db-test-init.tcl 21 Aug 2019 16:18:04 -0000 1.18.2.3 +++ openacs-4/packages/news/tcl/test/news-db-test-init.tcl 14 Feb 2021 21:17:56 -0000 1.18.2.4 @@ -948,7 +948,7 @@ $live_revision_id $revision2_id # - # Okay, lets set the original revision as active. + # Okay, let's set the original revision as active. # aa_log "Reset the first revision as live" set p_revision_id $revision1_id