diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x | rhimport-dn | 4 | ||||
| -rwxr-xr-x | rhimport-fw | 1 | ||||
| -rwxr-xr-x | rhimport-ra | 4 | ||||
| -rwxr-xr-x | rhimport-rs | 2 |
5 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1ddc032..af32503 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +rhimport (0.3.9-2) unstable; urgency=low + + * output now includes url of feed (easier for manual import) + + -- Christian Pointner <equinox@helsinki.at> Thu, 08 Nov 2012 11:37:41 +0100 + rhimport (0.3.9-1) unstable; urgency=low * autoimports now know if the run for the last time diff --git a/rhimport-dn b/rhimport-dn index 4c86bf3..5682ff1 100755 --- a/rhimport-dn +++ b/rhimport-dn @@ -96,7 +96,9 @@ if($dropbox eq "") { my $y = sprintf("%04d-%02d-%02d", $broadcast_day[0], $broadcast_day[1], $broadcast_day[2]); my $yc = sprintf("%04d-%02d%02d", $broadcast_day[0], $broadcast_day[1], $broadcast_day[2]); + print "looking for files from date $y in RSS Feed\n"; +print " -> $FILES_RSS_URL\n"; my $files_feed = XML::Feed->parse(URI->new($FILES_RSS_URL)) or die "Error fetching feed: " . XML::Feed->errstr; @@ -138,6 +140,8 @@ if($file eq "" || !(-e "$file")) { print "\nlooking for headlines from date $y in RSS Feed\n"; +print " -> $HEADLINES_RSS_URL\n"; + my $headlines_feed = XML::Feed->parse(URI->new($HEADLINES_RSS_URL)) or die "Error fetching feed: " . XML::Feed->errstr; diff --git a/rhimport-fw b/rhimport-fw index 75fcd27..009a137 100755 --- a/rhimport-fw +++ b/rhimport-fw @@ -87,6 +87,7 @@ if($dropbox eq "") { my $regexp = sprintf("%04d%02d%02d(.*)\\.mp3\$", $broadcastday[0], $broadcastday[1], $broadcastday[2]); print "looking for file from " . Date::Calc::Date_to_Text(@broadcastday) . " in RSS Feed\n"; +print " -> $RSS_URL\n"; my $feed = XML::Feed->parse(URI->new($RSS_URL)) or die "Error fetching feed: " . XML::Feed->errstr; diff --git a/rhimport-ra b/rhimport-ra index 84097f0..f363c15 100755 --- a/rhimport-ra +++ b/rhimport-ra @@ -83,11 +83,13 @@ print "day of Radio Helsinki rebroadcast: " . Date::Calc::Date_to_Text(@import_d my $bd = sprintf("%04d-%02d-%02d", $broadcast_day[0], $broadcast_day[1], $broadcast_day[2]); print "looking for files from $bd in RSS Feed\n"; -my $bdexp = sprintf("^(\\d+)\\..*,\\s*0?%d\\s*\\.\\s*0?%d\\s*\\.\\s*%4d", $broadcast_day[2], $broadcast_day[1], $broadcast_day[0]); +print " -> $RSS_URL\n"; my $feed = XML::Feed->parse(URI->new($RSS_URL)) or die "Error fetching feed: " . XML::Feed->errstr; +my $bdexp = sprintf("^(\\d+)\\..*,\\s*0?%d\\s*\\.\\s*0?%d\\s*\\.\\s*%4d", $broadcast_day[2], $broadcast_day[1], $broadcast_day[0]); + my $file = ""; my $out_file = ""; for my $entry ($feed->entries) { diff --git a/rhimport-rs b/rhimport-rs index 3cbc3ff..099b30b 100755 --- a/rhimport-rs +++ b/rhimport-rs @@ -92,7 +92,9 @@ my $bdtw = sprintf("%04d-%02d-%02d", $broadcast_day[0], $broadcast_day[1], $broa my $bdtwfile = sprintf("RAST%04d%02d%02dCBA(.*)\.MP3", $broadcast_day[0], $broadcast_day[1], $broadcast_day[2]); my $bdlw = sprintf("%04d-%02d-%02d", $broadcast_day_last_week[0], $broadcast_day_last_week[1], $broadcast_day_last_week[2]); my $bdlwfile = sprintf("RAST%04d%02d%02dCBA(.*)\.MP3", $broadcast_day_last_week[0], $broadcast_day_last_week[1], $broadcast_day_last_week[2]); + print "looking for files from $bdtw or $bdlw in RSS Feed\n"; +print " -> $RSS_URL\n"; my $feed = XML::Feed->parse(URI->new($RSS_URL)) or die "Error fetching feed: " . XML::Feed->errstr; |