Changeset 759

Timestamp:

06/10/07 04:47:02 (6 years ago)

Author:

paul

Message:

Fix oztivo so it doesn't put <desc> lines after a newline at the top of programme without tags
Only seen for ACC and EXPO channels.
output.xmltv: no element title found at /usr/share/perl5/XMLTV.pm line 1993.
output.xmltv: unknown element #PCDATA at /usr/share/perl5/XMLTV.pm line 2005

Files:

• grabbers/oztivo (modified) (3 diffs)
• status (modified) (1 diff)

grabbers/oztivo

@@ -3 +3 @@
 # OzTivo grabber
 
-my $version = '0.31';
+my $version = '0.32';
 
 # Requires configuration!
@@ -201 +201 @@
         star-rating ];
 my %xmltv_tags = map { $_ => "" } @xmltv_tag_order;
+$xmltv_tags{"programme"}=""; $xmltv_tags{"/programme"}="";
 my $linenum = 0;
 my $cur_field = "";
@@ -210 +211 @@
     next if ($line =~ /<director><\/director>/);
     next if ($line =~ /<desc><\/desc>/);
+    next if ($line =~ /^\s*$/);
 
     if ($line =~ /\s*<([\/a-zA-Z\-]+)/) {
-        my $field = lc($1);
-
-        if (($field eq "programme") || ($field eq "/programme")) {
-            # print all previously seen tags in xmltv_tag_order
-            foreach my $xmltag (@xmltv_tag_order) {
-                if ($xmltv_tags{$xmltag} ne "") {
-                    print OUT $xmltv_tags{$xmltag};
-                    $xmltv_tags{$xmltag} = "";
-                }
-            }
-
-            # if we have a start="(time)" and/or stop="(time)" make sure they
-            # have a timezone on them.
-            $line = $1."start=\"".$2." +0000\"".$3 if ($line =~ /^(.*)start="([0-9]+)"(.*)/);
-            $line = $1."stop=\"".$2." +0000\"".$3 if ($line =~ /^(.*)stop="([0-9]+)"(.*)/);
-
-            print OUT $line."\n"; # programme tag
-            $cur_field = "";
-        } else {
-            # do we know about this tag?
-            $cur_field = $field if (defined $xmltv_tags{$field});
-
-            if ($cur_field eq "") {
-                print OUT $line."\n";
-            } else {
-                $xmltv_tags{$cur_field} .= $line."\n";
-            }
-        }
+        my $field = lc($1);
+        # do we know about this tag?
+        $cur_field = $field if (defined $xmltv_tags{$field});
+    }
+
+    if ($cur_field eq "programme") {
+        # if we have a start="(time)" and/or stop="(time)" make sure they
+        # have a timezone on them.
+        $line = $1."start=\"".$2." +0000\"".$3 if ($line =~ /^(.*)start="([0-9]+)"(.*)/);
+        $line = $1."stop=\"".$2." +0000\"".$3 if ($line =~ /^(.*)stop="([0-9]+)"(.*)/);
+
+        print OUT $line."\n"; # programme tag
+        $cur_field = "";
+    } elsif ($cur_field eq "/programme") {
+        print "Program with no title!\n" 
+                if (($xmltv_tags{title} eq "") or ($xmltv_tags{title} =~ />\s*</));
+        # print all previously seen tags in xmltv_tag_order
+        foreach my $xmltag (@xmltv_tag_order) {
+            if ($xmltv_tags{$xmltag} ne "") {
+                print OUT $xmltv_tags{$xmltag};
+                $xmltv_tags{$xmltag} = "";
+            }
+        }
+        print OUT $line."\n"; # /programme tag
+        $cur_field = "";
     } else {
-        print OUT $line."\n";
-    }
-} 
+        if ($cur_field eq "") {
+            print OUT $line."\n"; # ?xml, tv and /tv tags
+        } else {
+            $xmltv_tags{$cur_field} .= $line."\n"; # xmltv_tags tags
+        }
+    }
+}
 
 close OUT;

status

@@ -7 +7 @@
 grabber         abc_website         3.03
 grabber         sbsnews_website     0.16
-grabber         oztivo              0.31-r1
+grabber         oztivo              0.32
 grabber         jrobbo              0.09
 grabber         yahoo7web           0.20