Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v diff -u -N -r1.27.8.7 -r1.27.8.8 --- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 28 Sep 2013 12:24:24 -0000 1.27.8.7 +++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl 2 Oct 2013 07:55:04 -0000 1.27.8.8 @@ -250,9 +250,9 @@ } ad_proc -private api_format_author { author_string } { - if { [regexp {^[^ \n\r\t]+$} $author_string] && \ - [string first "@" $author_string] >= 0 && \ - [string first ":" $author_string] < 0 } { + if { [regexp {^[^ \n\r\t]+$} $author_string] + && [string first "@" $author_string] >= 0 + && [string first ":" $author_string] < 0 } { return "$author_string" } elseif { [regexp {^([^\(\)]+)\s+\((.+)\)$} [string trim $author_string] {} name email] } { return "$name <$email>" @@ -441,8 +441,7 @@ @return the formatted documentation string. @error if the procedure is not defined. } { - if { $format ne "text/html" && \ - $format ne "text/plain" } { + if { $format ne "text/html" && $format ne "text/plain" } { return -code error "Only text/html and text/plain documentation are currently supported" } array set doc_elements [nsv_get api_proc_doc $proc_name] @@ -556,8 +555,9 @@ append out " (boolean)" } - if { [info exists default_values($switch)] && \ - $default_values($switch) ne "" } { + if { [info exists default_values($switch)] + && $default_values($switch) ne "" + } { append out " (defaults to \"$default_values($switch)\")" } @@ -832,9 +832,9 @@ } } elseif {[regexp {^([^ ]+)(Class|Object) (.*)$} $proc_name match thread kind obj]} { return [$thread do $obj serialize] - } elseif {[info proc $proc_name] ne ""} { + } elseif {[info procs $proc_name] ne ""} { return [info body $proc_name] - } elseif {[info proc ::nsf::procs::$proc_name] ne ""} { + } elseif {[info procs ::nsf::procs::$proc_name] ne ""} { return [info body ::nsf::procs::$proc_name] } else { return "No such Tcl-proc" @@ -863,7 +863,7 @@ } { - if {[info command ::xotcl::api] ne ""} { + if {[info commands ::xotcl::api] ne ""} { set scope [::xotcl::api scope_from_proc_index $proc_name] } else { set scope "" @@ -996,7 +996,7 @@ {gets puts socket tell format scan} \ ] - if {[info command ::xotcl::api] ne ""} { + if {[info commands ::xotcl::api] ne ""} { set XOTCL_KEYWORDS [list self my next] # only command names are highlighted, otherwise we could add xotcl method # names by [lsort -unique [concat [list self my next] .. @@ -1035,7 +1035,7 @@ } "\$" { - if {$in_comment || ([string index $data $i+1] eq " ")} { + if {$in_comment || [string index $data $i+1] eq " "} { append html "\$" } else { set varl [length_var [string range $data $i end]] Index: openacs-4/packages/acs-api-browser/www/type-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/type-view.tcl,v diff -u -N -r1.3 -r1.3.20.1 --- openacs-4/packages/acs-api-browser/www/type-view.tcl 26 Jan 2004 15:39:41 -0000 1.3 +++ openacs-4/packages/acs-api-browser/www/type-view.tcl 2 Oct 2013 07:55:04 -0000 1.3.20.1 @@ -13,8 +13,9 @@ documentation:onevalue } -if { ![info exists version_id] && \ - [regexp {^([^ /]+)/} $type "" package_key] } { +if { ![info exists version_id] + && [regexp {^([^ /]+)/} $type "" package_key] + } { db_0or1row version_id_from_package_key { select version_id from apm_enabled_package_versions