Commit 01b3c9b6 authored by Joakim Nylén's avatar Joakim Nylén

Remove reruns

parent 0b219f68
......@@ -148,14 +148,6 @@ sub ImportContent {
push @{$extra->{images}}, { url => $image, source => "Arirang" };
}
if(defined($first_run) and $first_run eq 1) {
$ce->{new} = 1;
} else {
$ce->{new} = 0;
push @{$extra->{qualifiers}}, "rerun";
}
$ce->{extra} = $extra;
p( "Arirang: $chd->{xmltvid}: $ce->{start_time} - $title" );
......
......@@ -36,6 +36,10 @@ sub new {
$self->{datastorehelper} = $dsh;
$self->{datastore}->{SILENCE_END_START_OVERLAP} = 1;
# use augment
$self->{datastore}->{augment} = 1;
return $self;
}
......
......@@ -239,15 +239,6 @@ sub ImportContent
AddCategory( $ce, $program_type, $category );
}
# Rerun?
if($rerun eq "true") {
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "repeat";
} else {
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
}
# Live?
if($live eq "true") {
$ce->{live} = "1";
......
......@@ -183,17 +183,6 @@ sub ImportContent {
$ce->{quality} = "HDTV";
}
# Rerun?
my $rerun = $b->findvalue( 'pro_publish[1]/ppu_isrerun' );
if( $rerun eq "TRUE" )
{
$ce->{new} = "0";
}
else
{
$ce->{new} = "1";
}
# Prod year
$ce->{production_date} = "$year-01-01" if $year ne "";
......
......@@ -183,15 +183,6 @@ sub ImportContent {
} else {
$ce->{live} = "0";
}
my $rerun = $b->findvalue( 'pro_publish[1]/ppu_isrerun' );
if( $rerun eq "TRUE" ) {
$ce->{rerun} = "1";
push @{$extra->{qualifiers}}, "rerun";
} else {
$ce->{rerun} = "0";
}
my $subtitled = $b->findvalue( 'pro_publish[1]/ppu_subtext_type' );
if( $subtitled eq "TTV" ) {
push @{$extra->{qualifiers}}, "CC";
......
......@@ -315,14 +315,6 @@ sub ImportContent
$ce->{program_type} = 'movie';
}
# replay
if(defined($rerun) and norm($rerun) eq "true") {
$ce->{new} = "0";
} else {
$ce->{new} = "1";
}
$dsh->AddProgramme( $ce );
}
}
......
......@@ -128,15 +128,6 @@ sub ImportContent {
push @{$extra->{qualifiers}}, "SD";
}
# replay
if(defined($rerun) and norm($rerun) eq "No") {
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
} elsif(defined($rerun) and norm($rerun) eq "Yes") {
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "rerun";
}
# Find live-info
if( $live eq "Yes" )
{
......
......@@ -262,16 +262,6 @@ sub ImportXML
$ce->{production_date} = "$1-01-01";
}
# Find rerun-info
if( $rerun eq "ja" )
{
$ce->{new} = "0";
}
else
{
$ce->{new} = "1";
}
# Add programme
$ds->AddProgrammeRaw( $ce );
progress( "DreiPlus: $chd->{xmltvid}: $ce->{start_time} - $stitle" );
......
......@@ -177,16 +177,6 @@ sub ImportXML
$ce->{original_title} = norm($title_org) if defined $title_org and norm($title_org) ne $ce->{title} and $title_org ne "";
$ce->{original_subtitle} = norm($subtitle_org) if defined $subtitle_org and norm($subtitle_org) ne $ce->{title} and norm($subtitle_org) ne norm($subtitle) and $subtitle_org ne "";
# Find rerun-info
if( $premiere eq "Yes" )
{
$ce->{new} = "1";
}
else
{
$ce->{new} = "0";
}
progress( "HistoryXML: $chd->{xmltvid}: $start - $title" );
$ds->AddProgramme( $ce );
......
......@@ -244,17 +244,6 @@ sub ImportContent
push @{$extra->{images}}, { url => $image, source => "OUTTV" };
}
# Find rerun-info
if( !defined($rerun) or $rerun eq "" )
{
$ce->{new} = "1";
}
else
{
push @{$extra->{qualifiers}}, "repeat";
$ce->{new} = "0";
}
$ce->{extra} = $extra;
# Add Programme
......
......@@ -164,14 +164,6 @@ sub ImportContent( $$$ ) {
{
$ce->{live} = "0";
}
if( $repeat eq "1" )
{
$ce->{rerun} = "1";
}
else
{
$ce->{rerun} = "0";
}
progress("MTVNN: $chd->{xmltvid}: ".$start->ymd("-") . " " . $start->hms(":")." - $title");
......
......@@ -239,14 +239,6 @@ sub ImportContent {
}
}
# Rerun?
if(defined($rerun) and norm($rerun) eq "(R)") {
$ce->{new} = "0";
} else {
$ce->{new} = "1";
}
progress("$start - $end : $ce->{title}");
$dsh->AddProgramme( $ce );
......
......@@ -150,13 +150,6 @@ sub ImportContent
$ce->{live} = 0;
}
if( defined($rerun) and $rerun eq "true" ) {
$ce->{new} = 0;
push @{$extra->{qualifiers}}, "repeat";
} else {
$ce->{new} = 1;
}
# Credits
......
......@@ -377,12 +377,6 @@ sub ImportContent {
$ce->{quality} = "HDTV" if $hd eq "yes";
if($rerun eq "yes" or $rerun eq "1") {
$ce->{new} = "0";
} else {
$ce->{new} = "1";
}
$dsh->AddProgramme( $ce );
}
......
......@@ -151,7 +151,7 @@ sub ImportXML
numberOfEpisodes => norm($ci->findvalue( 'v41:numberOfEpisodes' )),
productionYear => norm($ci->findvalue( 'v41:productionYear' )),
countryOfOrigin => join("||", ParseIt($ci, 'v41:countryOfOriginList/v41:country')),
title => norm($ci->findvalue( 'v41:titleList/v41:title[@type="content"]' )),
title => norm($ci->findvalue( 'v41:titleList/v41:title[@type="season"]' )),
description_med => norm($ci->findvalue( 'v41:descriptionList/v41:description[@length="medium"]' )),
keywords => join("||", ParseIt($ci, 'v41:categoryList/v41:category/v41:treeNode')),
};
......@@ -440,13 +440,6 @@ sub ImportXML
$ce->{live} = "0";
}
# Rerun?
if($is_rerun eq "true") {
$ce->{new} = "0";
} else {
$ce->{new} = "1";
}
# Keywords / Genres
if(defined($keywords)) {
foreach my $keyword (split(/\|\|/, $keywords)) {
......
......@@ -158,14 +158,6 @@ sub ImportContent
$ce->{live} = "0";
}
if($rerun eq "true") {
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "rerun";
} elsif($live ne "true") {
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
}
if($catchup eq "true") {
push @{$extra->{qualifiers}}, "catchup";
}
......
......@@ -275,15 +275,6 @@ sub ImportContent
push @{$extra->{images}}, { url => $ic->findvalue( 'url' ), title => $ic->findvalue( 'caption' ), copyright => $ic->findvalue( 'byline' ), source => "TV2 Denmark" };
}
## New?
my $new = $pgm->findvalue( 'new' );
if($new eq "1") {
$ce->{new} = 1;
} else {
$ce->{new} = 0;
push @{$extra->{qualifiers}}, "repeat";
}
$ce->{extra} = $extra;
# End of transmission
......
......@@ -248,14 +248,6 @@ sub ImportContent
$ce->{program_type} = 'series';
}
# replay
if(defined($rerun) and norm($rerun) eq "true") {
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "repeat";
} else {
$ce->{new} = "1";
}
$ce->{extra} = $extra;
$ce->{subtitle} = undef;
......
......@@ -348,15 +348,6 @@ sub ImportContent
delete($ce->{episode}) if defined($ce->{episode});
}
# replay
if(defined($rerun) and norm($rerun) eq "false") {
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
} else {
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "rerun";
}
$ce->{extra} = $extra;
progress($date." ".$starttime." - ".$ce->{title});
......
......@@ -246,19 +246,7 @@ sub ImportContent {
$ce->{aspect} = "4:3";
#push @{$extra->{qualifiers}}, "smallscreen";
}
# Find rerun-info
if( $rerun eq "TRUE" )
{
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "repeat";
}
else
{
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
}
# Find live-info
if( $live eq "TRUE" or $lead eq "LIVE" or $lead eq "LIVE:" )
{
......
......@@ -329,18 +329,6 @@ sub ImportContent {
#push @{$extra->{qualifiers}}, "smallscreen";
}
# Find rerun-info
if( $rerun eq "true" )
{
$ce->{new} = "0";
push @{$extra->{qualifiers}}, "repeat";
}
else
{
$ce->{new} = "1";
push @{$extra->{qualifiers}}, "new";
}
# Find live-info
if( $live eq "true" or $lead eq "LIVE" or $lead eq "LIVE:" or $lead eq "DIREKTE:" )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment