aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-30 05:44:17 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-30 05:44:17 +0000
commitb9693d13ef99d3d904a2a9f8226da400fff2c807 (patch)
treea23e9bbdcf7219d6be65adc8a6cc2a51d781cc5f
parentc23e8009bf7b4300b1bc32aea6528a1e7454ec1f (diff)
downloadikiwiki-b9693d13ef99d3d904a2a9f8226da400fff2c807.tar
ikiwiki-b9693d13ef99d3d904a2a9f8226da400fff2c807.tar.gz
robustness and etc
-rw-r--r--IkiWiki/Plugin/aggregate.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 99b26a546..75e6f31d6 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -93,7 +93,7 @@ sub preprocess (@) { #{{{
return "<a href=\"".$feed->{url}."\">".$feed->{name}."</a>: ".
"<i>".$feed->{message}."</i> (".$feed->{numposts}.
- " stored posts; ".$feed->{newposts}." new)";
+ " stored posts; ".$feed->{newposts}." new)<br />";
} # }}}
sub delete (@) { #{{{
@@ -192,9 +192,15 @@ FEED: foreach my $feed (values %feeds) {
if (! @urls) {
$feed->{message}="could not find feed at ".$feed->{feedurl};
IkiWiki::debug($feed->{message});
+ next FEED;
}
foreach my $url (@urls) {
- my $f=XML::Feed->parse(URI->new($url));
+ my $f=eval{XML::Feed->parse(URI->new($url))};
+ if ($@) {
+ $feed->{message}="feed crashed XML::Feed! $@";
+ IkiWiki::debug($feed->{message});
+ next FEED;
+ }
if (! $f) {
$feed->{message}=XML::Feed->errstr;
IkiWiki::debug($feed->{message});