Add 'copyrightlogo' type to all scripts, but left unused for now

mythplugins/mythweather/mythweather/scripts/ca_envcan/envcan.pl

@@ -43,7 +43,7 @@
             'date-2', 'icon-2', 'low-2', 'high-2', 'updatetime',
             'date-3', 'icon-3', 'low-3', 'high-3',
             'date-4', 'icon-4', 'low-4', 'high-4',
-            'date-5', 'icon-5', 'low-5', 'high-5' );
+            'date-5', 'icon-5', 'low-5', 'high-5', 'copyrightlogo' );
 
 my $dir = "./";
 

mythplugins/mythweather/mythweather/scripts/ca_envcan/envcan_animaps.pl

@@ -35,7 +35,8 @@
 my $email = 'vitaminjoe@gmail.com';
 my $updateTimeout = 10*60;
 my $retrieveTimeout = 30;
-my @types = ('amdesc', 'updatetime', 'animatedimage', 'copyright');
+my @types = ('amdesc', 'updatetime', 'animatedimage', 'copyright',
+             'copyrightlogo');
 my $dir = "/tmp/envcan";
 
 getopts('Tvtlu:d:');

mythplugins/mythweather/mythweather/scripts/ca_envcan/envcan_maps.pl

@@ -36,7 +36,7 @@
 my $email = 'gjhurlbu@gmail.com';
 my $updateTimeout = 10*60;
 my $retrieveTimeout = 30;
-my @types = ('smdesc', 'updatetime', 'map', 'copyright');
+my @types = ('smdesc', 'updatetime', 'map', 'copyright', 'copyrightlogo');
 my $dir = "/tmp/envcan";
 
 getopts('Tvtlu:d:');

mythplugins/mythweather/mythweather/scripts/no_yrno/yrnoxml.pl

@@ -37,7 +37,7 @@
               'temp-0', 'temp-1', 'temp-2', 'temp-3', 'temp-4', 'temp-5', 
               'time-0', 'time-1', 'time-2', 'time-3', 'time-4', 'time-5', 
               'pop-0', 'pop-1', 'pop-2', 'pop-3', 'pop-4', 'pop-5',
-              'updatetime', 'station_id' );
+              'updatetime', 'station_id', 'copyrightlogo' );
 my $dir = "/tmp/yrnoxml";
 my $logdir = "/tmp/yrnoxml";
 my %images = ( "partly cloudy" => "pcloudy.png", "cloudy" => "cloudy.png",

mythplugins/mythweather/mythweather/scripts/uk_bbc/bbccurrentxml.pl

@@ -32,7 +32,7 @@
 my $updateTimeout = 120*60;
 # 2 Hours, BBC updates infrequently ~3 hours
 my $retrieveTimeout = 30;
-my @types = ('cclocation', 'station_id', 'copyright',
+my @types = ('cclocation', 'station_id', 'copyright', 'copyrightlogo',
         'observation_time', 'weather', 'temp', 'relative_humidity',
         'wind_dir', 'pressure', 'visibility', 'weather_icon',
         'appt', 'wind_spdgst');
@@ -117,7 +117,7 @@
 # The required elements which aren't provided by this feed
 printf "appt::NA\n";
 
-printf "copyright::From bbc.co.uk\n";
+printf "copyright::bbc.co.uk - ©2012 BBC\n";
 printf "station_id::" . $locid . "\n";
 my $location = $xml->{channel}->{title};
 $location =~ s/.*?Observations for (.*)$/$1/s;

mythplugins/mythweather/mythweather/scripts/uk_bbc/bbcthreedayxml.pl

@@ -31,10 +31,11 @@
 my $email = 'gjhurlbu@gmail.com / stuart@tase.co.uk';
 my $updateTimeout = 360*60; # 6 Hours
 my $retrieveTimeout = 30;
-my @types = ('3dlocation', 'station_id', 'copyright', 'weather_icon',
-        'date-0', 'icon-0', 'low-0', 'high-0',
-        'date-1', 'icon-1', 'low-1', 'high-1',
-        'date-2', 'icon-2', 'low-2', 'high-2', 'updatetime');
+my @types = ('3dlocation', 'station_id', 'copyright', 'copyrightlogo',
+             'weather_icon',
+             'date-0', 'icon-0', 'low-0', 'high-0',
+             'date-1', 'icon-1', 'low-1', 'high-1',
+             'date-2', 'icon-2', 'low-2', 'high-2', 'updatetime');
 my $dir = "/tmp/uk_bbc";
 my $logdir = "/tmp/uk_bbc";
 
@@ -114,7 +115,7 @@
     die "Not xml";
 }
 
-printf "copyright::From bbc.co.uk\n";
+printf "copyright::bbc.co.uk - ©2012 BBC\n";
 printf "station_id::" . $locid . "\n";
 my $location = $xml->{channel}->{title};
 $location =~ s/.*?Forecast for (.*)$/$1/s;

mythplugins/mythweather/mythweather/scripts/us_nws/ndfd.pl

@@ -31,7 +31,8 @@
         'high-0', 'high-1', 'high-2', 'high-3', 'high-4', 'high-5',
         'low-0', 'low-1', 'low-2', 'low-3', 'low-4', 'low-5',
         'icon-0', 'icon-1', 'icon-2', 'icon-3', 'icon-4', 'icon-5',
-        'date-0', 'date-1', 'date-2', 'date-3', 'date-4', 'date-5', 'copyright');
+        'date-0', 'date-1', 'date-2', 'date-3', 'date-4', 'date-5',
+        'copyright', 'copyrightlogo');
 my $dir = './';
 my $icon_file = dirname(abs_path($0 or $PROGRAM_NAME)) . "/icons";
 

mythplugins/mythweather/mythweather/scripts/us_nws/ndfd18.pl

@@ -27,7 +27,8 @@
         'temp-0', 'temp-1', 'temp-2', 'temp-3', 'temp-4', 'temp-5',
         '18icon-0', '18icon-1', '18icon-2', '18icon-3', '18icon-4', '18icon-5',
         'pop-0', 'pop-1', 'pop-2', 'pop-3', 'pop-4', 'pop-5',
-        'time-0', 'time-1', 'time-2', 'time-3', 'time-4', 'time-5', 'copyright');
+        'time-0', 'time-1', 'time-2', 'time-3', 'time-4', 'time-5',
+        'copyright', 'copyrightlogo');
 my $dir = './';
 my $icon_file = dirname(abs_path($0 or $PROGRAM_NAME)) . "/icons";
 

mythplugins/mythweather/mythweather/scripts/us_nws/nws-alert.pl

@@ -146,7 +146,8 @@ sub getEffectiveWarnings {
 my $email = 'gjhurlbu@gmail.com';
 my $updateTimeout = 10*60;
 my $retrieveTimeout = 30;
-my @types = ('swlocation', 'updatetime', 'alerts', 'copyright');
+my @types = ('swlocation', 'updatetime', 'alerts', 'copyright',
+             'copyrightlogo');
 my $dir = "./";
 
 getopts('Tvtlu:d:');

mythplugins/mythweather/mythweather/scripts/us_nws/nwsxml.pl

@@ -29,7 +29,8 @@
         'wind_dir', 'wind_degrees', 'wind_speed', 'wind_gust',
         'pressure_string', 'pressure', 'dewpoint_string', 'dewpoint',
         'heat_index_string', 'heat_index', 'windchill_string', 'windchill',
-        'visibility', 'weather_icon', 'appt', 'wind_spdgst', 'copyright');
+        'visibility', 'weather_icon', 'appt', 'wind_spdgst', 'copyright',
+        'copyrightlogo');
 my $dir = "./";
 my $icon_file = dirname(abs_path($0 or $PROGRAM_NAME)) . "/icons";