debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Take text from each feed element for tree and web view

Browse source
This commit is contained in:
Dale Whittaker 2010-03-26 21:06:44 +01:00 committed by Christian Dywan
parent fdf075513c
commit 9607f2107e
3 changed files with 21 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
extensions/feed-panel/feed-atom.c
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net> Copyright (C) 2009-2010 Dale Whittaker <dayul@users.sf.net>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -130,34 +130,6 @@ atom_get_link (KatzeItem* item,
xmlFree (newtype); xmlFree (newtype);
} }
static gchar*
atom_get_title (FeedParser* fparser)
{
const gchar* name;
if (!(name = katze_item_get_name (fparser->item)))
{
gchar* type;
type = (gchar*)xmlGetProp (fparser->node, BAD_CAST "type");
if (type)
{
gchar* content = NULL;
if (g_str_equal (type, "html") ||
g_str_equal (type, "xhtml"))
content = feed_get_element_markup (fparser);
xmlFree (type);
if (content)
return content;
}
return feed_get_element_string (fparser);
}
return g_strdup (name);
}
static void static void
atom_preparse_entry (FeedParser* fparser) atom_preparse_entry (FeedParser* fparser)
{ {
@ -181,12 +153,12 @@ atom_parse_entry (FeedParser* fparser)
} }
else if (!xmlStrcmp (node->name, BAD_CAST "title")) else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{ {
content = atom_get_title (fparser); content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content); katze_item_set_name (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "summary")) else if (!xmlStrcmp (node->name, BAD_CAST "summary"))
{ {
content = feed_get_element_string (fparser); content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content); katze_item_set_text (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "updated")) else if (!xmlStrcmp (node->name, BAD_CAST "updated"))
@ -209,7 +181,7 @@ atom_parse_entry (FeedParser* fparser)
/* Only retrieve content if there is no summary */ /* Only retrieve content if there is no summary */
if (!katze_item_get_text (fparser->item)) if (!katze_item_get_text (fparser->item))
{ {
content = feed_get_element_string (fparser); content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content); katze_item_set_text (fparser->item, content);
} }
} }
@ -269,12 +241,12 @@ atom_parse_feed (FeedParser* fparser)
} }
else if (!xmlStrcmp (node->name, BAD_CAST "title")) else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{ {
content = atom_get_title (fparser); content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content); katze_item_set_name (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "subtitle")) else if (!xmlStrcmp (node->name, BAD_CAST "subtitle"))
{ {
content = feed_get_element_string (fparser); content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content); katze_item_set_text (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "updated")) else if (!xmlStrcmp (node->name, BAD_CAST "updated"))

21
extensions/feed-panel/feed-parse.c
View file

@ -13,12 +13,19 @@
#include <time.h> #include <time.h>
gchar* gchar*
feed_get_element_string (FeedParser* fparser) feed_get_element_markup (FeedParser* fparser)
{ {
xmlNodePtr node; xmlNodePtr node;
node = fparser->node; node = fparser->node;
if (node->children &&
!xmlIsBlankNode (node->children) &&
node->children->type == XML_ELEMENT_NODE)
{
return ((gchar*) xmlNodeGetContent (node->children));
}
if (!node->children || if (!node->children ||
xmlIsBlankNode (node->children) || xmlIsBlankNode (node->children) ||
(node->children->type != XML_TEXT_NODE && (node->children->type != XML_TEXT_NODE &&
@ -71,19 +78,11 @@ feed_remove_markup (gchar* markup)
} }
gchar* gchar*
feed_get_element_markup (FeedParser* fparser) feed_get_element_string (FeedParser* fparser)
{ {
gchar* markup; gchar* markup;
xmlNodePtr node = fparser->node;
if (node->children && markup = feed_get_element_markup (fparser);
!xmlIsBlankNode (node->children) &&
node->children->type == XML_ELEMENT_NODE)
{
return (gchar*) xmlNodeGetContent (node->children);
}
markup = feed_get_element_string (fparser);
return feed_remove_markup (markup); return feed_remove_markup (markup);
} }

10
extensions/feed-panel/feed-rss.c
View file

@ -1,5 +1,5 @@
/* /*
Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net> Copyright (C) 2009-2010 Dale Whittaker <dayul@users.sf.net>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -107,12 +107,12 @@ rss_parse_item (FeedParser* fparser)
} }
else if (!xmlStrcmp (node->name, BAD_CAST "title")) else if (!xmlStrcmp (node->name, BAD_CAST "title"))
{ {
content = feed_get_element_markup (fparser); content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content); katze_item_set_name (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "description")) else if (!xmlStrcmp (node->name, BAD_CAST "description"))
{ {
content = feed_get_element_string (fparser); content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content); katze_item_set_text (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "pubDate")) else if (!xmlStrcmp (node->name, BAD_CAST "pubDate"))
@ -184,12 +184,12 @@ rss_parse_channel (FeedParser* fparser)
if (!xmlStrcmp (node->name, BAD_CAST "title")) if (!xmlStrcmp (node->name, BAD_CAST "title"))
{ {
content = feed_get_element_markup (fparser); content = feed_get_element_string (fparser);
katze_item_set_name (fparser->item, content); katze_item_set_name (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "description")) else if (!xmlStrcmp (node->name, BAD_CAST "description"))
{ {
content = feed_get_element_string (fparser); content = feed_get_element_markup (fparser);
katze_item_set_text (fparser->item, content); katze_item_set_text (fparser->item, content);
} }
else if (!xmlStrcmp (node->name, BAD_CAST "lastBuildDate")) else if (!xmlStrcmp (node->name, BAD_CAST "lastBuildDate"))