valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

support RDF-XML feeds

This commit is contained in:
Andrew Dolgov 2013-05-01 20:30:52 +04:00
parent 4c00e15b5d
commit 852d4ac890
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
classes/feedparser.php
View File

@ -28,12 +28,16 @@ class FeedParser {
$xpath = new DOMXPath($this->doc); $xpath = new DOMXPath($this->doc);
$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom'); $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/'); $xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
$this->xpath = $xpath; $this->xpath = $xpath;
$root = $xpath->query("(//atom:feed|//channel)")->item(0); $root = $xpath->query("(//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
if ($root) { if ($root) {
switch ($root->tagName) { switch (mb_strtolower($root->tagName)) {
case "rdf:rdf":
$this->type = $this::FEED_RDF;
break;
case "channel": case "channel":
$this->type = $this::FEED_RSS; $this->type = $this::FEED_RSS;
break; break;
@ -88,7 +92,33 @@ class FeedParser {
} }
break; break;
case $this::FEED_RDF:
$xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
$title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
if ($title) {
$this->title = $title->nodeValue;
} }
$link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
if ($link) {
$this->link = $link->nodeValue;
}
$articles = $xpath->query("//rssfake:item");
foreach ($articles as $article) {
array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
}
break;
}
} else {
$this->error = "Unknown/unsupported feed type";
return;
} }
} }

2
include/rssfuncs.php
View File

@ -448,11 +448,13 @@
$feed_title = db_escape_string($rss->get_title()); $feed_title = db_escape_string($rss->get_title());
if ($feed_title) {
_debug("registering title: $feed_title", $debug_enabled); _debug("registering title: $feed_title", $debug_enabled);
db_query("UPDATE ttrss_feeds SET db_query("UPDATE ttrss_feeds SET
title = '$feed_title' WHERE id = '$feed'"); title = '$feed_title' WHERE id = '$feed'");
} }
}
if ($site_url && $orig_site_url != $site_url) { if ($site_url && $orig_site_url != $site_url) {
db_query("UPDATE ttrss_feeds SET db_query("UPDATE ttrss_feeds SET