Changeset 529

Timestamp:

02/18/07 19:17:00 (6 years ago)

Author:

lincoln

Message:

reconciler now parses $opt_channels also

Files:

• reconcilers/reconciler_mk2 (modified) (6 diffs)
• status (modified) (1 diff)

reconcilers/reconciler_mk2

@@ -95 +95 @@
 
 my $progname = "reconciler_mk2";
-my $version = "0.19";
+my $version = "0.20";
 
 use LWP::UserAgent;
-use Time::HiRes qw(gettimeofday tv_interval);
 use XMLTV;
 use POSIX qw(strftime mktime);
@@ -195 +194 @@
 #
 
-my $script_start_time = [gettimeofday];
+my $script_start_time = time;
 my %stats;
 my $datafile;
-my $channels;
-my $opt_channels;
+my $channels, my $opt_channels;
 my $in = { };
 my $out = { };
@@ -210 +208 @@
 my $title_history;      # cached
 
-my %amp;
-BEGIN { %amp = ( nbsp => ' ', qw{ amp & lt < gt > apos ' quot " } ) }
+my %amp = ( nbsp => ' ', qw{ amp & lt < gt > apos ' quot " } );
 
 
@@ -301 +298 @@
         exit(0);
 }
-
-@ARGV = ('-') if not @ARGV;
 
 # go go go!
@@ -547 +542 @@
 
         foreach my $ch (sort keys %{$channels}) {
-                my $id = $channels->{$ch};
-
-                $in->{channels}->{$id}->{lang}->{($opt->{lang})} = $ch;
-                $in->{channels}->{$id}->{pref_desc} = $ch;
-                $in->{total_progs}->{$id} = 0;
-                $in->{total_progs_in}->{$id} = 0;
-                $in->{total_progs_out}->{$id} = 0;
-        }
+                &fill_channel($ch, $channels->{$ch});
+        }
+        foreach my $ch (sort keys %{$opt_channels}) {
+                &fill_channel($ch, $opt_channels->{$ch});
+        }
+
+}
+
+######################################################################################################
+
+sub fill_channel
+{
+        my ($ch, $id) = @_;
+
+        $in->{channels}->{$id}->{lang}->{($opt->{lang})} = $ch;
+        $in->{channels}->{$id}->{pref_desc} = $ch;
+        $in->{total_progs}->{$id} = 0;
+        $in->{total_progs_in}->{$id} = 0;
+        $in->{total_progs_out}->{$id} = 0;
 }
 
@@ -571 +577 @@
 sub print_stats
 {
-        printf "STATS: %s v%s completed in %0.2f seconds",$progname, $version, tv_interval($script_start_time);
+        printf "STATS: %s v%s completed in %d seconds",$progname, $version, (time - $script_start_time);
         foreach my $key (sort keys %stats) {
                 printf ", %d %s", $stats{$key},$key;

status

@@ -10 +10 @@
 grabber         yahoo7web           0.10
 grabber         ten_website         0.05
-reconciler      reconciler_mk2      0.19
+reconciler      reconciler_mk2      0.20
 postprocessor   imdb_augment_data   0.09
 postprocessor   augment_timezone    0.08