Index: openacs-4/packages/news-aggregator/tcl/source-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/source-procs.tcl,v diff -u -r1.6.2.7 -r1.6.2.8 --- openacs-4/packages/news-aggregator/tcl/source-procs.tcl 7 Feb 2006 19:31:54 -0000 1.6.2.7 +++ openacs-4/packages/news-aggregator/tcl/source-procs.tcl 27 Jul 2006 11:39:13 -0000 1.6.2.8 @@ -151,10 +151,15 @@ } if { ![string equal 200 $f(status)] } { - ns_log Debug "source::update: httpget didn't return 200 but $f(status)" + ns_log Debug "source::update: httpget didn't return 200 but $f(status)" return 0 } + if { $f(page) eq "File not found." } { + ns_log Debug "source::update: httpget could not find the file $feed_url $headers" + return 0 + } + array set result [feed_parser::parse_feed -xml $f(page)] if { $result(status) eq "error" } { @@ -339,8 +344,7 @@ set source_id [lindex $source 0] set feed_url [lindex $source 1] set last_modified [lindex $source 2] - - if { ![news_aggregator::source::update \ + if { ![news_aggregator::source::update \ -source_id $source_id \ -feed_url $feed_url \ -modified $last_modified] } { Index: openacs-4/packages/news-aggregator/www/aggregator-tabs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-tabs.adp,v diff -u -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 28 Jan 2006 04:17:44 -0000 1.1.2.2 +++ openacs-4/packages/news-aggregator/www/aggregator-tabs.adp 27 Jul 2006 11:39:13 -0000 1.1.2.3 @@ -13,21 +13,21 @@ -
General
+
General
-
Subscriptions
+
Subscriptions
-
Permissions
+
Permissions
Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v diff -u -r1.7.2.6 -r1.7.2.7 --- openacs-4/packages/news-aggregator/www/subscriptions.tcl 7 Feb 2006 19:30:48 -0000 1.7.2.6 +++ openacs-4/packages/news-aggregator/www/subscriptions.tcl 27 Jul 2006 11:39:13 -0000 1.7.2.7 @@ -147,6 +147,7 @@ ad_form -name add_subscription -action subscriptions -form { {subscription_id:integer(hidden),key} + {aggregator_id:integer(hidden) {value $aggregator_id}} {feed_url:text(text),optional {value $feed_url_val} {label "URL"}