xmltv/grab/uk_rt tv_grab_uk_rt,1.40,1.41

Nick Morrott <[email protected]>
Newsgroups gmane.comp.tv.xmltv.cvs
Message-ID <[email protected]>
Update of /cvsroot/xmltv/xmltv/grab/uk_rt
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8139/grab/uk_rt

Modified Files:
	tv_grab_uk_rt 
Log Message:
Improve fixups checking

Index: tv_grab_uk_rt
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/uk_rt/tv_grab_uk_rt,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** tv_grab_uk_rt	9 Jan 2015 01:18:08 -0000	1.40
--- tv_grab_uk_rt	16 Jun 2015 00:51:33 -0000	1.41
***************
*** 1441,1444 ****
--- 1441,1449 ----
              # processing codes are documented in prog_titles_to_process file
              if ($code eq '1')  {
+                 my @fields = split( /~/, $process_text, -1);
+                 if (scalar @fields != 1) {
+                     t("[1] Invalid number of fields (need 1) in processing text: '" . $process_text . "'");
+                     next PROG_TITLE_ENTRY;
+                 }
                  push @{$non_title_info{$idx_char}}, $process_text;
                  t("[1] Will remove '" . $process_text . "' from title if found");
***************
*** 1447,1450 ****
--- 1452,1460 ----
              }
              elsif ($code eq '2') {
+                 my @fields = split( /~/, $process_text, -1);
+                 if (scalar @fields != 1) {
+                     t("[2] Invalid number of fields (need 1) in processing text: '" . $process_text . "'");
+                     next PROG_TITLE_ENTRY;
+                 }
                  push @{$mixed_title_subtitle{$idx_char}}, $process_text;
                  t("[2] Will check for subtitle after title for '" . $process_text . "'");
***************
*** 1453,1456 ****
--- 1463,1471 ----
              }
              elsif ($code eq '3') {
+                 my @fields = split( /~/, $process_text, -1);
+                 if (scalar @fields != 1) {
+                     t("[3] Invalid number of fields (need 1) in processing text: '" . $process_text . "'");
+                     next PROG_TITLE_ENTRY;
+                 }
                  push @mixed_subtitle_title, $process_text;
                  t("[3] Will check for subtitle before title for '" . $process_text . "'");
***************
*** 1459,1462 ****
--- 1474,1482 ----
              }
              elsif ($code eq '4') {
+                 my @fields = split( /~/, $process_text, -1);
+                 if (scalar @fields != 1) {
+                     t("[4] Invalid number of fields (need 1) in processing text: '" . $process_text . "'");
+                     next PROG_TITLE_ENTRY;
+                 }
                  push @{$reversed_title_subtitle{$idx_char}}, $process_text;
                  t("[4] Will check for reversed title/subtitle for '" . $process_text . "'");
***************
*** 1465,1469 ****
              }
              elsif ($code eq '5') {
!                 my @fields = split( /~/, $process_text, 2);
                  if (scalar @fields != 2) {
                      t("[5] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
--- 1485,1489 ----
              }
              elsif ($code eq '5') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 2) {
                      t("[5] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
***************
*** 1477,1481 ****
              }
              elsif ($code eq '6') {
!                 my @fields = split( /~/, $process_text, 2);
                  if (scalar @fields != 2) {
                      t("[6] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
--- 1497,1501 ----
              }
              elsif ($code eq '6') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 2) {
                      t("[6] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
***************
*** 1493,1497 ****
              }
              elsif ($code eq '7') {
!                 my @fields = split( /~/, $process_text, 3);
                  if (scalar @fields != 3) {
                      t("[7] Invalid number of fields (need 3) in processing text: '" . $process_text . "'");
--- 1513,1517 ----
              }
              elsif ($code eq '7') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 3) {
                      t("[7] Invalid number of fields (need 3) in processing text: '" . $process_text . "'");
***************
*** 1505,1509 ****
              }
              elsif ($code eq '8') {
!                 my @fields = split( /~/, $process_text, 4);
                  if (scalar @fields != 4) {
                      t("[8] Invalid number of fields (need 4) in processing text: '" . $process_text . "'");
--- 1525,1529 ----
              }
              elsif ($code eq '8') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 4) {
                      t("[8] Invalid number of fields (need 4) in processing text: '" . $process_text . "'");
***************
*** 1543,1547 ****
              }
              elsif ($code eq '9') {
!                 my @fields = split( /~/, $process_text, 3);
                  if (scalar @fields != 3) {
                      t("[9] Invalid number of fields (need 3) in processing text: '" . $process_text . "'");
--- 1563,1567 ----
              }
              elsif ($code eq '9') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 3) {
                      t("[9] Invalid number of fields (need 3) in processing text: '" . $process_text . "'");
***************
*** 1556,1560 ****
              }
              elsif ($code eq '10') {
!                 my @fields = split( /~/, $process_text, 5);
                  if (scalar @fields != 5) {
                      t("[10] Invalid number of fields (need 5) in processing text: '" . $process_text . "'");
--- 1576,1580 ----
              }
              elsif ($code eq '10') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 5) {
                      t("[10] Invalid number of fields (need 5) in processing text: '" . $process_text . "'");
***************
*** 1585,1589 ****
              }
              elsif ($code eq '11')  {
!                 my @fields = split( /~/, $process_text, 2);
                  if (scalar @fields != 2) {
                      t("[11] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
--- 1605,1609 ----
              }
              elsif ($code eq '11')  {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 2) {
                      t("[11] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
***************
*** 1602,1606 ****
              }
              elsif ($code eq '12') {
!                 my @fields = split( /~/, $process_text, 2);
                  if (scalar @fields != 2) {
                      t("[12] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
--- 1622,1626 ----
              }
              elsif ($code eq '12') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 2) {
                      t("[12] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
***************
*** 1614,1618 ****
              }
              elsif ($code eq '13') {
!                 my @fields = split( /~/, $process_text, 2);
                  if (scalar @fields != 2) {
                      t("[13] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");
--- 1634,1638 ----
              }
              elsif ($code eq '13') {
!                 my @fields = split( /~/, $process_text, -1);
                  if (scalar @fields != 2) {
                      t("[13] Invalid number of fields (need 2) in processing text: '" . $process_text . "'");


------------------------------------------------------------------------------
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.