xmltv/grab/fi test.conf, 2.04, 2.05 test.sh, 2.03, 2.04

Update of /cvsroot/xmltv/xmltv/grab/fi
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30835/grab/fi

Modified Files:
	test.conf test.sh 
Log Message:
- test.conf: add foxtv.fi
- test.sh: fix to work with latest XMLTV tools


Index: test.sh
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/fi/test.sh,v
retrieving revision 2.03
retrieving revision 2.04
diff -C2 -d -r2.03 -r2.04
*** test.sh	10 Oct 2012 20:36:30 -0000	2.03
--- test.sh	15 Oct 2013 21:03:52 -0000	2.04
***************
*** 78,91 ****
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 2 --cache  t_fi_cache  > t_fi_1_2.xml --quiet 2>t_fi_1.log
  validate_xml t_fi_1_2.xml
! ${xmltv_script}/tv_cat t_fi_1_2.xml > /dev/null 2>t_fi_6.log
  check_log t_fi_6.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_1_2.xml > t_fi_1_2.sorted.xml 2>t_fi_1_2.sort.log
  check_log t_fi_1_2.sort.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 1 --cache  t_fi_cache  --output t_fi_1_1.xml  2>t_fi_2.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 2 --days 1 --cache  t_fi_cache  > t_fi_2_1.xml 2>t_fi_3.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 2 --cache  t_fi_cache  --quiet --output t_fi_4.xml 2>t_fi_4.log
! ${xmltv_script}/tv_cat t_fi_1_1.xml t_fi_2_1.xml > t_fi_1_2-2.xml 2>t_fi_5.log
  check_log t_fi_5.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_1_2-2.xml > t_fi_1_2-2.sorted.xml 2>t_fi_7.log
  check_log t_fi_7.log
  diff t_fi_1_2.sorted.xml t_fi_1_2-2.sorted.xml > t_fi__1_2.diff
--- 78,91 ----
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 2 --cache  t_fi_cache  > t_fi_1_2.xml --quiet 2>t_fi_1.log
  validate_xml t_fi_1_2.xml
! ${xmltv_script}/tv_cat t_fi_1_2.xml --output /dev/null 2>t_fi_6.log
  check_log t_fi_6.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_1_2.xml --output t_fi_1_2.sorted.xml 2>t_fi_1_2.sort.log
  check_log t_fi_1_2.sort.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 1 --cache  t_fi_cache  --output t_fi_1_1.xml  2>t_fi_2.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 2 --days 1 --cache  t_fi_cache  > t_fi_2_1.xml 2>t_fi_3.log
  perl -I ${xmltv_lib} ${script_file} --config-file ${script_dir}/test.conf --offset 1 --days 2 --cache  t_fi_cache  --quiet --output t_fi_4.xml 2>t_fi_4.log
! ${xmltv_script}/tv_cat t_fi_1_1.xml t_fi_2_1.xml --output t_fi_1_2-2.xml 2>t_fi_5.log
  check_log t_fi_5.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_1_2-2.xml --output t_fi_1_2-2.sorted.xml 2>t_fi_7.log
  check_log t_fi_7.log
  diff t_fi_1_2.sorted.xml t_fi_1_2-2.sorted.xml > t_fi__1_2.diff
***************
*** 101,109 ****
      perl -I ${xmltv_lib} ${script_file} --config-file ${test_dir}/test.conf --offset $d --days 1 --cache  t_fi_cache  >t_fi_single_$d.xml --quiet 2>>t_fi_single.log
  done
! ${xmltv_script}/tv_cat t_fi_full_10.xml > /dev/null 2>t_fi_output.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_full_10.xml > t_fi_full_10.sorted.xml 2>>t_fi_output.log
  check_log t_fi_output.log
! ${xmltv_script}/tv_cat t_fi_single_*.xml >t_fi_full_10-2.xml 2>t_fi_output-2.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_full_10-2.xml > t_fi_full_10-2.sorted.xml 2>>t_fi_output-2.log
  check_log t_fi_output-2.log
  diff t_fi_full_10.sorted.xml t_fi_full_10-2.sorted.xml >t_fi__10.diff
--- 101,109 ----
      perl -I ${xmltv_lib} ${script_file} --config-file ${test_dir}/test.conf --offset $d --days 1 --cache  t_fi_cache  >t_fi_single_$d.xml --quiet 2>>t_fi_single.log
  done
! ${xmltv_script}/tv_cat t_fi_full_10.xml --output /dev/null 2>t_fi_output.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_full_10.xml --output t_fi_full_10.sorted.xml 2>>t_fi_output.log
  check_log t_fi_output.log
! ${xmltv_script}/tv_cat t_fi_single_*.xml --output t_fi_full_10-2.xml 2>t_fi_output-2.log
! ${xmltv_script}/tv_sort --duplicate-error t_fi_full_10-2.xml --output t_fi_full_10-2.sorted.xml 2>>t_fi_output-2.log
  check_log t_fi_output-2.log
  diff t_fi_full_10.sorted.xml t_fi_full_10-2.sorted.xml >t_fi__10.diff

Index: test.conf
===================================================================
RCS file: /cvsroot/xmltv/xmltv/grab/fi/test.conf,v
retrieving revision 2.04
retrieving revision 2.05
diff -C2 -d -r2.04 -r2.05
*** test.conf	10 Oct 2012 20:36:30 -0000	2.04
--- test.conf	15 Oct 2013 21:03:52 -0000	2.05
***************
*** 370,373 ****
--- 370,374 ----
  #channel yte.se.yle.fi YLE Teema
  ##channel zonereality.telvis.fi Zone Reality
+ channel foxtv.fi FOX
  
  # Title name mappings


------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk