From 2f00ce071a66b16da9e5acabee5d8479f1f04082 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sat, 21 Nov 2009 18:20:42 +0000 Subject: [PATCH] * use toplevel thingie tag to detect whether we're RSS or ATOM. --- citadel/modules/rssclient/serv_rssclient.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c index b6517242b..f35f84c43 100644 --- a/citadel/modules/rssclient/serv_rssclient.c +++ b/citadel/modules/rssclient/serv_rssclient.c @@ -470,20 +470,27 @@ void rss_xml_start(void *data, const char *supplied_el, const char **attr) { strcpy(el, ++sep); } - if (((rssc->Cfg->ItemType == RSS_UNSET) || - (rssc->Cfg->ItemType == RSS_RSS)) && + if ((rssc->Cfg->ItemType == RSS_UNSET) && + !strcasecmp(el, "rss")) + { + rssc->Cfg->ItemType = RSS_RSS; + } + else if ((rssc->Cfg->ItemType == RSS_UNSET) && + !strcasecmp(el, "feed")) + { + rssc->Cfg->ItemType = RSS_ATOM; + } + else if ((rssc->Cfg->ItemType == RSS_RSS) && !strcasecmp(el, "item")) { ri->item_tag_nesting ++ ; - rssc->Cfg->ItemType = RSS_RSS; flush_rss_ite(ri); } - else if (((rssc->Cfg->ItemType == RSS_UNSET) || - (rssc->Cfg->ItemType == RSS_ATOM)) && - !strcasecmp(el, "entry")) { /* Atom feed... */ + else if ( (rssc->Cfg->ItemType == RSS_ATOM) && + !strcasecmp(el, "entry")) + { /* Atom feed... */ CtdlLogPrintf(0, "RSS: found atom...\n"); ++ri->item_tag_nesting; - rssc->Cfg->ItemType = RSS_ATOM; flush_rss_ite(ri); } else if ((rssc->Cfg->ItemType == RSS_ATOM) && -- 2.39.2