--- comics/fetch.pl.new	2017/12/05 13:37:40	1.22
+++ comics/fetch.pl.new	2018/04/22 14:03:54	1.26
@@ -2,6 +2,26 @@
 
 ###############################################################################
 # $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.
+#
+# Revision 1.24  2018/02/06 14:31:06  nick
+# A status report is now generated in JSON that can easily be scanned so that
+# I can be alerted when there are failures that I miss if I don't read the
+# comics that day.
+#
+# Revision 1.23  2018/01/26 13:05:27  nick
+# Added a new config option to remove all newline from the resulting index.html
+# file.  This allows for easier parsing for certain comics.  I then updated
+# the URLs to search for and enabled the newline removal for a handful
+# of uComics.
+#
+# I believe I've also properly fixed the Comic Config version displayed on
+# the webpage itself.
+#
 # Revision 1.22  2017/12/05 13:37:40  nick
 # Added the CVS config version to the outpuit.
 #
@@ -33,15 +53,16 @@ use File::Path;
 use Data::Dumper;
 use Pod::Usage;
 use Getopt::Long;
-
+use JSON::Create 'create_json';
 use Date::Calc qw/Date_to_Text_Long Today Day_of_Week Day_of_Week_to_Text/;
 
 ## 
 ## Some default values
 ##
-my $ver		= '$Id: fetch.pl.new,v 1.22 2017/12/05 13:37:40 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";
 my %comics	= &readComicConfig ( $comicFile );
 my %opts        = &fetchOptions( );
 my $days_ago    = $opts{'days'} || 0;
@@ -68,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;
   }
@@ -79,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 );
 
@@ -104,6 +125,9 @@ foreach my $comic ( sort keys %comics )
 
 &writeFooter( \%dates );
 
+print STDOUT "Status written to $reportFile.\n"
+    if (&writeStatusReportJSON(\%comics, $reportFile));
+
 $DATE=`date`;  chomp( $DATE );
 print STDOUT "Completed comic fetch at $DATE\n";
 
@@ -150,7 +174,8 @@ sub readComicConfig ($$) {
 
 	open FILEN, "<$comicFile";
 		while (<FILEN>) {
-            if ($_ =~ m/^#.* \$Id: fetch.pl.new,v 1.22 2017/12/05 13:37:40 nick Exp $/) {
+            #if ($_ =~ m/^#.* \$[Ii][Dd]: fetch.pl.new,v 1.23 2018/01/26 13:05:27 nick Exp $/) {
+            if ($_ =~ m/^#.* \$[Ii][dD]: .*,v\ (.*)\ \d{4}\/.*\$$/) {
                 $comicConfigVer = $1;
             }
 			if ( ( $_ !~ m/^#/ ) && ( $_ =~ m/,.*,/) ){
@@ -164,8 +189,9 @@ 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;
 			}
 			elsif ( $_ =~ m/(.*)\s+=\s+(.*)/ ) {
@@ -179,6 +205,39 @@ sub readComicConfig ($$) {
 
 #######################################################################
 #######################################################################
+sub writeStatusReportJSON ($$) {
+	my ( $comicsRef, $filename ) = @_;
+    my %comics = %$comicsRef;
+    my $shortDate = sprintf("%d%02d%02d", (localtime)[5] + 1900,
+                                          (localtime)[4] + 1,
+                                          (localtime)[3]);
+    my %json = ('date' => $shortDate, 'comics' => []);
+    my $totalErrors = 0;
+
+    foreach my $comic (sort keys %comics) {
+      next unless $comics{$comic}{'fullName'};
+      if ($comics{$comic}{'error'}) {
+        my %error = ('comicName' => "$comics{$comic}{'fullName'}",
+                     'error' => "$comics{$comic}{'error'}",
+                     'status' => "Error");
+        push $json{'comics'}, \%error;
+        $totalErrors += 1;
+      } else {
+        my %status = ('comicName' => "$comics{$comic}{'fullName'}",
+                      'error' => 0,
+                      'status' => "Successfull");
+        push $json{'comics'}, \%status;
+      }
+    }
+    $json{'totalErrors'} = $totalErrors;    
+
+    open SR, ">$filename" or die ("ERROR: Failed to create status report: $!\n");
+    print SR create_json (\%json);
+    close(SR); 
+}
+
+#######################################################################
+#######################################################################
 sub writeComic ($$) {
 	my ( $comics, $comic, $date ) = @_;
 	my $sd = substr( join( '', $days[$date->{'dow'}] ), 0, 3 );
@@ -342,7 +401,11 @@ sub indexDownload ($$) {
         	return "ERROR: Can't open index file for " . $comics->{$comic}{'fullName'} . 
 		       " (" . $comics->{$comic}{'url'} . ")"; 
 	} 
-		@lines = <FILEN>;
+    while (<FILEN>) {
+        my $line = $_;
+        $line =~ s/\R|\ \ +|\t//g if ( $comics->{$comic}{'remove_newliens'} );
+    	push @lines, $line;
+    }
 	close (FILEN);	
 
 	unlink ("$comicIndex");