Added patch from AsamK

- Support link in attribute href of the link node, e.g. <link href="..." />

Support author in creator node

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-01-09 12:17:05 +00:00
parent a96c467419
commit edd8a2c0ec

View File

@ -876,6 +876,10 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
/* try feedburner:origLink */ /* try feedburner:origLink */
if (!xml.getChildText(node, "origLink", item->link) || item->link.empty()) { if (!xml.getChildText(node, "origLink", item->link) || item->link.empty()) {
xml.getChildText(node, "link", item->link); xml.getChildText(node, "link", item->link);
if (item->link.empty()) {
xmlNodePtr linkNode = xml.findNode(node, "link", true);
item->link = xml.getAttr(linkNode, "href");
}
} }
// remove sid= // remove sid=
@ -908,7 +912,9 @@ RsFeedReaderErrorState p3FeedReaderThread::process(const RsFeedReaderFeed &feed,
xml.getChildText(node, "name", item->author); xml.getChildText(node, "name", item->author);
} }
} else { } else {
xml.getChildText(node, "author", item->author); if (!xml.getChildText(node, "author", item->author)) {
xml.getChildText(node, "creator", item->author);
}
} }
switch (feedFormat) { switch (feedFormat) {