diff options
| -rwxr-xr-x | rhautoimport-er | 8 | ||||
| -rwxr-xr-x | rhautoimport-oi | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/rhautoimport-er b/rhautoimport-er index 90577c9..34b431d 100755 --- a/rhautoimport-er +++ b/rhautoimport-er @@ -29,8 +29,8 @@ use XML::Feed::Content; use XML::Feed::Enclosure; use URI::URL; use HTML::Entities; +use RHRD::utils; -use lib '../rhrdlibs/lib'; use lib '/usr/local/share/rhautoimport/'; use rhautoimport; @@ -59,7 +59,7 @@ if(!defined $allowed_dbs[0] && defined $allowed_dbs[1]) { } if(scalar(@allowed_dbs) != 1) { - print "found more or less than 1 Dropbox for this group?!\n"; + print "found more or less than one Dropbox for this group?!\n"; exit 1; } my $show_id = $allowed_dbs[0]->{'SHOWID'}; @@ -68,8 +68,6 @@ my $show_title = $allowed_dbs[0]->{'SHOWTITLE'}; my $curweek = RHRD::utils::get_rd_week(); my @today = Date::Calc::Today(); -print "today: " . Date::Calc::Date_to_Text(@today) . " (Week: " . $curweek . ")\n"; - my @import_date = Date::Calc::Standard_to_Business(@today); $import_date[2] = 5; @import_date = Date::Calc::Business_to_Standard(@import_date); @@ -84,6 +82,8 @@ if($curweek == 1 || $curweek == 3) { } my $broadcast_num = `cat $LAST_FILE`; $broadcast_num += 1; + +print "today: " . Date::Calc::Date_to_Text(@today) . " (Week: " . $curweek . ")\n"; print "day of next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@import_date) . "\n"; print "Number of next broadcast: " . $broadcast_num . "\n\n"; diff --git a/rhautoimport-oi b/rhautoimport-oi index 0f5b9b4..dd6a2fc 100755 --- a/rhautoimport-oi +++ b/rhautoimport-oi @@ -80,9 +80,9 @@ $import_date[2] = 1; my $broadcast_num = `cat $LAST_FILE`; $broadcast_num += 1; -print "today: " . Date::Calc::Date_to_Text(@today) . "\n"; +print "today: " . Date::Calc::Date_to_Text(@today) . " (Week: " . $curweek . ")\n"; print "day of next Radio Helsinki broadcast: " . Date::Calc::Date_to_Text(@import_date) . "\n"; -print "Number of next broadcast: " . $broadcast_num . "\n"; +print "Number of next broadcast: " . $broadcast_num . "\n\n"; my $id = sprintf("%04d-%02d-%02d", @import_date); my $bdfile = sprintf('.*onda.?info[-_]%d.*\.mp3$', $broadcast_num); |