Index: openacs-4/packages/feed-parser/tcl/feed-parser-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/feed-parser/tcl/feed-parser-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/feed-parser/tcl/feed-parser-procs.tcl	30 May 2004 12:32:12 -0000	1.3
+++ openacs-4/packages/feed-parser/tcl/feed-parser-procs.tcl	30 May 2004 14:20:29 -0000	1.4
@@ -250,13 +250,10 @@
     # Unless we have explicit encoding information, we'll assume UTF-8
     if { [regexp {^[[:space:]]*<\?xml[^>]+encoding="([^"]*)"} $xml match encoding] } {
         set encoding [string tolower $encoding]
-        array set converts {
-            utf-8 utf-8
-            iso-8859-1 iso8859-1
+        set tcl_encoding [ns_encodingforcharset $encoding]
+        if { $tcl_encoding ne "" } {
+            set xml [encoding convertfrom $tcl_encoding $xml]
         }
-        if { [info exists converts($encoding)] } {
-            set xml [encoding convertfrom $converts($encoding) $xml]
-        }
     }
 
     # Prefill these slots for errors