Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #272812 --> RSS item Subject has mis-transcoded international characters

Browse Source 
Another attempt to get our I18n conversions working for feeds.

patch by robert sayre.

sr=mscott


git-svn-id: svn://10.0.0.236/trunk@174508 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2005-06-13 17:07:56 +00:00
parent fb872fd6e0
commit d582fba40b
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/mail/extensions/newsblog/content/FeedItem.js
View File

@ -160,28 +160,10 @@ FeedItem.prototype =
{
this.mUnicodeConverter.charset = this.characterSet;
try
{
if (this.title)
this.title = this.mUnicodeConverter.ConvertToUnicode(this.title);
} catch (ex) {}
try
{
if (this.description)
this.description = this.mUnicodeConverter.ConvertToUnicode(this.description);
} catch (ex) {}
if (this.isStored())
debug(this.identity + " already stored; ignoring");
else if (this.content)
{
try
{
this.content = this.mUnicodeConverter.ConvertToUnicode(this.content);
}
catch (ex) {}
debug(this.identity + " has content; storing");
var content = MESSAGE_TEMPLATE;
content = content.replace(/%CONTENT_TEMPLATE%/, LOCAL_CONTENT_TEMPLATE);

23
mozilla/mail/extensions/newsblog/content/feed-parser.js
View File

@ -59,7 +59,14 @@ FeedParser.prototype =
&& (aDOM.documentElement.getElementsByTagNameNS("http://purl.org/rss/1.0/", "channel")[0]))
{
debug(aFeed.url + " is an RSS 1.x (RDF-based) feed");
return this.parseAsRSS1(aFeed, aSource, aBaseURI);
// aSource can be misencoded (XMLHttpRequest converts to UTF-8 by default),
// but the DOM is almost always right because it uses the hints in the XML file.
// This is slower, but not noticably so. Mozilla doesn't have the
// XMLHttpRequest.responseBody property that IE has, which provides access
// to the unencoded response.
var serial=new XMLSerializer();
var xmlString=serial.serializeToString(aDOM.documentElement);
return this.parseAsRSS1(aFeed, xmlString, aBaseURI);
}
else if (aDOM.documentElement.namespaceURI == ATOM_03_NS)
{
@ -101,10 +108,7 @@ FeedParser.prototype =
return parsedItems;
aFeed.invalidateItems();
var itemNodes = aDOM.getElementsByTagName("item");
var converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"].
createInstance(Components.interfaces.nsIScriptableUnicodeConverter);
converter.charset = 'UTF-8';
var itemNodes = aDOM.getElementsByTagName("item");
for (var i=0; i<itemNodes.length; i++)
{
@ -130,12 +134,9 @@ FeedParser.prototype =
item.url = link ? link : (guid && isPermaLink) ? guid : null;
item.id = guid;
item.description = getNodeValue(itemNode.getElementsByTagName("description")[0]);
item.title = converter.ConvertFromUnicode(getNodeValue(itemNode.getElementsByTagName("title")[0])
item.title = getNodeValue(itemNode.getElementsByTagName("title")[0])
|| (item.description ? (this.stripTags(item.description).substr(0, 150)) : null)
|| item.title);
// do this after we potentially assign item.description into item.title
// because that potential assignment assumes the value is in unicode still
item.description = converter.ConvertFromUnicode(item.description);
|| item.title;
item.author = getNodeValue(itemNode.getElementsByTagName("author")[0]
|| itemNode.getElementsByTagName("creator")[0])
@ -159,8 +160,6 @@ FeedParser.prototype =
}
var content = getNodeValue(itemNode.getElementsByTagNameNS(RSS_CONTENT_NS, "encoded")[0]);
if (content)
item.content = converter.ConvertFromUnicode(content);
// Handle an enclosure (if present)
var enclosureNode = itemNode.getElementsByTagName("enclosure")[0];