Index: openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 1 Jan 2008 23:30:03 -0000 1.7 +++ openacs-4/packages/xotcl-core/tcl/http-client-procs.tcl 25 Mar 2008 13:17:57 -0000 1.8 @@ -154,7 +154,7 @@ # # for text, use translation with optional encodings, else set translation binary # - if {[string match text/* $content_type]} { + if {[string match "text/*" $content_type]} { if {[regexp {charset=([^ ]+)$} $content_type _ encoding]} { fconfigure [my set S] -translation $text_translation -encoding [string tolower $encoding] } else { Index: openacs-4/packages/xotcl-core/www/show-class-graph.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-class-graph.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/xotcl-core/www/show-class-graph.tcl 20 Mar 2008 13:49:02 -0000 1.2 +++ openacs-4/packages/xotcl-core/www/show-class-graph.tcl 25 Mar 2008 13:17:57 -0000 1.3 @@ -16,6 +16,23 @@ foreach e $l { lappend result \"$e\" } return $result } +::xotcl::Object instproc dot_append_method {{-documented_methods 1} e methods_ref kind} { + my upvar $methods_ref methods + set infokind $kind + if {$kind eq "instproc"} {append infokind s} + ::xotcl::api scope_from_object_reference scope e + foreach method [$e info $infokind] { + if {$documented_methods} { + set proc_index [::xotcl::api proc_index $scope $e $kind $method] + #my msg "check $method => [nsv_exists api_proc_doc $proc_index]" + if {[nsv_exists api_proc_doc $proc_index]} { + lappend methods $method + } + } else { + lappend methods $method + } + } +} ::xotcl::Object instproc dotcode {{-omit_base_classes 1} {-documented_methods 1} things} { set classes [list] set objects [list] @@ -75,15 +92,11 @@ } append tclasses "|" ::xotcl::api scope_from_object_reference scope e - foreach method [lsort [$e info instprocs]] { - if {$documented_methods} { - set proc_index [::xotcl::api proc_index $scope $e instproc $method] - if {[nsv_exists api_proc_doc $proc_index]} { - append tclasses "$method\\l" - } - } else { - append tclasses "$method\\l" - } + set methods [list] + my dot_append_method -documented_methods $documented_methods $e methods instproc + my dot_append_method -documented_methods $documented_methods $e methods instforward + foreach method [lsort $methods] { + append tclasses "$method\\l" } append tclasses "\}\"\];" } Index: openacs-4/packages/xotcl-core/www/show-object.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/www/show-object.tcl,v diff -u -N -r1.12 -r1.13 --- openacs-4/packages/xotcl-core/www/show-object.tcl 20 Mar 2008 13:49:02 -0000 1.12 +++ openacs-4/packages/xotcl-core/www/show-object.tcl 25 Mar 2008 13:17:57 -0000 1.13 @@ -183,8 +183,13 @@ # # compute list of classes with siblings set class_hierarchy [list] - foreach c [$object info superclass] {eval lappend class_hierarchy [$c info subclass]} - eval lappend class_hierarchy [$object info heritage] + foreach c [$object info superclass] { + if {$c eq "::xotcl::Object"} {continue} + eval lappend class_hierarchy [$c info subclass] + } + eval lappend class_hierarchy [$object info heritage] + if {[lsearch -exact $class_hierarchy $object] == -1} {lappend class_hierarchy $object} + #::xotcl::Object msg class_hierarchy=$class_hierarchy set class_hierarchy [ns_urlencode $class_hierarchy] #set class_hierarchy [ns_urlencode [concat $object [$object info heritage]]] }