--- comics/fetch.pl.new 2018/02/12 13:30:58 1.25 +++ comics/fetch.pl.new 2018/04/22 14:03:54 1.26 @@ -2,6 +2,9 @@ ############################################################################### # $Log: fetch.pl.new,v $ +# Revision 1.26 2018/04/22 14:03:54 nick +# Changed the default for Sunday comics that was causing issues with some comics. +# # Revision 1.25 2018/02/12 13:30:58 nick # Added an easier to compare date string to determine if the status json file was updated today and report if it wasn't. # @@ -56,7 +59,7 @@ use Date::Calc qw/Date_to_Text_Long Toda ## ## Some default values ## -my $ver = '$Id: fetch.pl.new,v 1.25 2018/02/12 13:30:58 nick Exp $'; +my $ver = '$Id: fetch.pl.new,v 1.26 2018/04/22 14:03:54 nick Exp $'; my $comicFile = "comics.conf"; my $comicConfigVer = "Unknown"; my $reportFile = "/home/httpd/html/daily/comics/status_report.json"; @@ -86,7 +89,7 @@ foreach my $comic ( sort keys %comics ) ## Skip if this is Sunday and the comic is weekdays only next if ( $comic =~ m/config/ ); if (($dates{'wday'} eq "Sunday") && - ($comics{$comic}{'sunday'} == 0)) { + ($comics{$comic}{'not_sunday'} == 1)) { print "Skipping '$comic'; Weekdays only.\n"; next; } @@ -97,7 +100,7 @@ foreach my $comic ( sort keys %comics ) print "Skipping '$comic' ($comics{$comic}{'sunday_only'}); Sunday only.\n"; next } - + $comics{$comic}{'error'} = &downloadComic ( \%comics, $comic, \%dates ); &writeComic ( \%comics, $comic, \%dates ); @@ -186,7 +189,7 @@ sub readComicConfig ($$) { $comicConfig{$res[0]}{'mode'} = $res[3]; $comicConfig{$res[0]}{'fullName'} = $res[4]; $comicConfig{$res[0]}{'ext'} = $res[5]; - $comicConfig{$res[0]}{'sunday'} = sprintf("%d", $res[6] || 1); + $comicConfig{$res[0]}{'not_sunday'} = sprintf("%d", $res[6] || 0); $comicConfig{$res[0]}{'sunday_only'} = sprintf("%d", $res[7] || 0); $comicConfig{$res[0]}{'remove_newlines'} = sprintf("%d", $res[8] || 0); $comicConfig{$res[0]}{'error'} = 0;