an
/
go-pkg-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #23 from MJDSys/FixFeedParsingForxmlx 

Fix Atom/RSS feed parsing due to changes in jteeuwen/go-pkg-xmlx.
This commit is contained in:
jimt 2013-10-26 02:12:37 -07:00
parent c173d50291 66eea2e6af
commit 3537b8643d
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
atom.go
View File

@ -50,14 +50,14 @@ func (this *Feed) readAtom(doc *xmlx.Document) (err error) {
if tn = node.SelectNode(ns, "subtitle"); tn != nil { if tn = node.SelectNode(ns, "subtitle"); tn != nil {
ch.SubTitle = SubTitle{} ch.SubTitle = SubTitle{}
ch.SubTitle.Type = tn.As("", "type") ch.SubTitle.Type = tn.As("", "type")
ch.SubTitle.Text = tn.Value ch.SubTitle.Text = tn.GetValue()
} }
if tn = node.SelectNode(ns, "generator"); tn != nil { if tn = node.SelectNode(ns, "generator"); tn != nil {
ch.Generator = Generator{} ch.Generator = Generator{}
ch.Generator.Uri = tn.As("", "uri") ch.Generator.Uri = tn.As("", "uri")
ch.Generator.Version = tn.As("", "version") ch.Generator.Version = tn.As("", "version")
ch.Generator.Text = tn.Value ch.Generator.Text = tn.GetValue()
} }
if tn = node.SelectNode(ns, "author"); tn != nil { if tn = node.SelectNode(ns, "author"); tn != nil {
@ -104,7 +104,7 @@ func (this *Feed) readAtom(doc *xmlx.Document) (err error) {
i.Content.Type = tn.As("", "type") i.Content.Type = tn.As("", "type")
i.Content.Lang = tn.S("xml", "lang") i.Content.Lang = tn.S("xml", "lang")
i.Content.Base = tn.S("xml", "base") i.Content.Base = tn.S("xml", "base")
i.Content.Text = tn.Value i.Content.Text = tn.GetValue()
} }
if tn = item.SelectNode(ns, "author"); tn != nil { if tn = item.SelectNode(ns, "author"); tn != nil {

35
rss.go
View File

@ -1,6 +1,10 @@
package feeder package feeder
import xmlx "github.com/jteeuwen/go-pkg-xmlx" import (
"errors"
xmlx "github.com/jteeuwen/go-pkg-xmlx"
)
func (this *Feed) readRss2(doc *xmlx.Document) (err error) { func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
days := make(map[string]int) days := make(map[string]int)
@ -34,7 +38,16 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
var list, tl []*xmlx.Node var list, tl []*xmlx.Node
const ns = "*" const ns = "*"
channels := doc.SelectNodes(ns, "channel") root := doc.SelectNode(ns, "rss")
if root == nil {
root = doc.SelectNode(ns, "RDF")
}
if root == nil {
return errors.New("Failed to find rss/rdf node in XML.")
}
channels := root.SelectNodes(ns, "channel")
for _, node := range channels { for _, node := range channels {
if ch = getChan(node.S(ns, "pubDate"), node.S(ns, "title")); ch == nil { if ch = getChan(node.S(ns, "pubDate"), node.S(ns, "title")); ch == nil {
ch = new(Channel) ch = new(Channel)
@ -46,7 +59,7 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
ch.Links = make([]Link, len(list)) ch.Links = make([]Link, len(list))
for i, v := range list { for i, v := range list {
ch.Links[i].Href = v.Value ch.Links[i].Href = v.GetValue()
} }
ch.Description = node.S(ns, "description") ch.Description = node.S(ns, "description")
@ -63,12 +76,12 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
for i, v := range list { for i, v := range list {
ch.Categories[i] = new(Category) ch.Categories[i] = new(Category)
ch.Categories[i].Domain = v.As(ns, "domain") ch.Categories[i].Domain = v.As(ns, "domain")
ch.Categories[i].Text = v.Value ch.Categories[i].Text = v.GetValue()
} }
if n = node.SelectNode(ns, "generator"); n != nil { if n = node.SelectNode(ns, "generator"); n != nil {
ch.Generator = Generator{} ch.Generator = Generator{}
ch.Generator.Text = n.Value ch.Generator.Text = n.GetValue()
} }
ch.TTL = node.I(ns, "ttl") ch.TTL = node.I(ns, "ttl")
@ -83,7 +96,7 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
list = node.SelectNodes(ns, "days") list = node.SelectNodes(ns, "days")
ch.SkipDays = make([]int, len(list)) ch.SkipDays = make([]int, len(list))
for i, v := range list { for i, v := range list {
ch.SkipDays[i] = days[v.Value] ch.SkipDays[i] = days[v.GetValue()]
} }
if n = node.SelectNode(ns, "image"); n != nil { if n = node.SelectNode(ns, "image"); n != nil {
@ -126,16 +139,16 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
tl = item.SelectNodes(ns, "link") tl = item.SelectNodes(ns, "link")
for _, v := range tl { for _, v := range tl {
lnk := new(Link) lnk := new(Link)
lnk.Href = v.Value lnk.Href = v.GetValue()
i.Links = append(i.Links, lnk) i.Links = append(i.Links, lnk)
} }
if n = item.SelectNode(ns, "author"); n != nil { if n = item.SelectNode(ns, "author"); n != nil {
i.Author = Author{} i.Author = Author{}
i.Author.Name = n.Value i.Author.Name = n.GetValue()
} }
if n = item.SelectNode(ns, "creator"); n != nil { if n = item.SelectNode(ns, "creator"); n != nil {
i.Author = Author{ Name: n.Value } i.Author = Author{ Name: n.GetValue() }
} }
i.Comments = item.S(ns, "comments") i.Comments = item.S(ns, "comments")
@ -146,7 +159,7 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
for _, lv := range tl { for _, lv := range tl {
cat := new(Category) cat := new(Category)
cat.Domain = lv.As(ns, "domain") cat.Domain = lv.As(ns, "domain")
cat.Text = lv.Value cat.Text = lv.GetValue()
i.Categories = append(i.Categories, cat) i.Categories = append(i.Categories, cat)
} }
@ -162,7 +175,7 @@ func (this *Feed) readRss2(doc *xmlx.Document) (err error) {
if src := item.SelectNode(ns, "source"); src != nil { if src := item.SelectNode(ns, "source"); src != nil {
i.Source = new(Source) i.Source = new(Source)
i.Source.Url = src.As(ns, "url") i.Source.Url = src.As(ns, "url")
i.Source.Text = src.Value i.Source.Text = src.GetValue()
} }
tl = item.SelectNodes("http://purl.org/rss/1.0/modules/content/", "*") tl = item.SelectNodes("http://purl.org/rss/1.0/modules/content/", "*")