xmltv/beta Augment.pm,1.1,1.2 augment.conf,1.1,1.2

Update of /cvsroot/xmltv/xmltv/beta
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17478

Modified Files:
	Augment.pm augment.conf 
Log Message:
change process_title_fixups to process_user_rules

Index: Augment.pm
===================================================================
RCS file: /cvsroot/xmltv/xmltv/beta/Augment.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Augment.pm	9 Dec 2014 11:32:08 -0000	1.1
--- Augment.pm	19 Dec 2014 08:34:07 -0000	1.2
***************
*** 25,29 ****
  User-defined rules use the content of a "rules" file which allows programmes
  matching certain user-defined criteria to be corrected/enhanced with the user
! data suplied (e.g. adding/changing categories for all episodes of "Horizon",
  or fixing misspellings in titles, etc.)
  
--- 25,29 ----
  User-defined rules use the content of a "rules" file which allows programmes
  matching certain user-defined criteria to be corrected/enhanced with the user
! data supplied (e.g. adding/changing categories for all episodes of "Horizon",
  or fixing misspellings in titles, etc.)
  
***************
*** 286,290 ****
  	# not explicitly disabled title processing during configuration
  	# and we have supplement data to process programmes against.
! 	$self->process_title_fixups($prog);
  	
  	
--- 286,290 ----
  	# not explicitly disabled title processing during configuration
  	# and we have supplement data to process programmes against.
! 	$self->process_user_rules($prog);
  	
  	
***************
*** 1152,1160 ****
  
  
! =item B<process_title_fixups>
  
  Rule #user
  
! Process programme against user-defined title fixups
  
  The individual rules each have their own option to run or not; consider this like an on/off switch for all of them. I.e. if this option is off then no user rules will be run (irrespective of any other option flags).
--- 1152,1160 ----
  
  
! =item B<process_user_rules>
  
  Rule #user
  
! Process programme against user-defined fixups
  
  The individual rules each have their own option to run or not; consider this like an on/off switch for all of them. I.e. if this option is off then no user rules will be run (irrespective of any other option flags).
***************
*** 1166,1170 ****
  # Process programme against user-defined title fixups
  #
! sub process_title_fixups () {
  	my ($self, $prog) = @_;
  	my $me = self();
--- 1166,1170 ----
  # Process programme against user-defined title fixups
  #
! sub process_user_rules () {
  	my ($self, $prog) = @_;
  	my $me = self();
***************
*** 1195,1200 ****
  	
  	
! 	# TODO : the user rules are not processed in numerical - there's no clues in
! 	#        uk_rt grabber (on whch this class is based) as to why the following
  	#        order was chosen or even if it matters (since most of the rules are
  	#        not cumulative)
--- 1195,1200 ----
  	
  	
! 	# TODO : the user rules are not processed in numerical order - there's no clues
! 	#        in uk_rt grabber (on whch this class is based) as to why the following
  	#        order was chosen or even if it matters (since most of the rules are
  	#        not cumulative)

Index: augment.conf
===================================================================
RCS file: /cvsroot/xmltv/xmltv/beta/augment.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** augment.conf	9 Dec 2014 11:32:08 -0000	1.1
--- augment.conf	19 Dec 2014 08:34:07 -0000	1.2
***************
*** 18,22 ****
  # Set the following values to have XMLTV::Augment automatically fetch a file
  # from the grabber's repository using XMLTV::Supplement
! use_supplement = 1
  supplement_grabber_name = tv_grab_uk_rt
  supplement_grabber_file = prog_titles_to_process
--- 18,22 ----
  # Set the following values to have XMLTV::Augment automatically fetch a file
  # from the grabber's repository using XMLTV::Supplement
! use_supplement = 0
  supplement_grabber_name = tv_grab_uk_rt
  supplement_grabber_file = prog_titles_to_process
***************
*** 95,103 ****
  #
  
! # Rule #user - Process programme against user-defined title fixups
  # If you disable this option (by setting to 0) then none of the user rules
  # will be actioned (irrespective of whether you have them set to 1 or 0)
  #
! process_title_fixups = 1
  
  # Rule #1 - Remove specified non-title text from <title>.
--- 95,103 ----
  #
  
! # Rule #user - Process programme against user-defined fixups
  # If you disable this option (by setting to 0) then none of the user rules
  # will be actioned (irrespective of whether you have them set to 1 or 0)
  #
! process_user_rules = 1
  
  # Rule #1 - Remove specified non-title text from <title>.


------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk