Index: openacs-4/packages/xowiki/tcl/syndicate-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/syndicate-procs.tcl,v diff -u -N -r1.23 -r1.24 --- openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 8 Nov 2007 13:18:10 -0000 1.23 +++ openacs-4/packages/xowiki/tcl/syndicate-procs.tcl 9 Nov 2007 09:01:50 -0000 1.24 @@ -391,12 +391,15 @@ RSS-client instproc load { } { set r [::xo::HttpRequest new -url [my url] -volatile] - my msg "statuscode = [$r set status_code], content_type=[$r set content_type]" + #my msg "statuscode = [$r set status_code], content_type=[$r set content_type]" set f [open /tmp/feed w]; fconfigure $f -translation binary; puts $f [$r set data]; close $f - return [$r set data] + set xml [$r set data] + set charset utf-8 + regexp {^<\?xml\s+version\s*=\s*\S+\s+encoding\s*=\s*[\"'](\S+)[\"']} $xml _ charset + return [encoding convertfrom $charset $xml] } - RSS-client instproc parse { data} { + RSS-client instproc parse {data} { set doc [ dom parse $data ] set root [ $doc documentElement ] Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -N -r1.108 -r1.109 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 8 Nov 2007 13:18:10 -0000 1.108 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 9 Nov 2007 09:01:50 -0000 1.109 @@ -73,6 +73,12 @@ return $result } + ::xowiki::Portlet instproc initialize {} { + # This method is called at a time after init and before render. + # It can be used to alter specified parameter from the user, + # or to influence the rendering of a decoration (e.g. title etc.) + } + ::xowiki::Portlet instproc js_name {} { return [string map [list : _ # _] [self]] } @@ -117,7 +123,6 @@ return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}] } - ::xowiki::Portlet proc incr_page_order {p} { regexp {^(.*[.]?)([^.])$} $p _ prefix suffix if {[string is integer -strict $suffix]} { @@ -833,18 +838,25 @@ {-max_entries:integer "15"} }} } + + rss-client instproc initialize {} { + my instvar feed + my get_parameters + my set feed [::xowiki::RSS-client new -url $url -destroy_on_cleanup] + my title [ [$feed channel] title] + } rss-client instproc render {} { + my instvar feed my get_parameters - set feed [::xowiki::RSS-client new -url $url -volatile] - my msg "feed=$feed" set channel [$feed channel] - my msg "channel=$channel" - set html "

[$channel title]

" - append html "