[Wepg-devel] parsers/gparse EuroTVCollector.java,1.2,1.3 EuroTVTokenizer.java,1.1.1.1,1.2

[<le...@us...>]

Update of /cvsroot/wepg/parsers/gparse
In directory sc8-pr-cvs1:/tmp/cvs-serv10494

Modified Files:
	EuroTVCollector.java EuroTVTokenizer.java 
Log Message:
parser fix for main listing page (theme unknown)

Index: EuroTVCollector.java
===================================================================
RCS file: /cvsroot/wepg/parsers/gparse/EuroTVCollector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EuroTVCollector.java	8 Mar 2003 18:25:04 -0000	1.2
--- EuroTVCollector.java	1 Jan 2004 10:52:12 -0000	1.3
***************
*** 77,86 ****
  	{
  		try {
- 			Element cat = doc.createElement( "theme" );
- 			cat.setAttribute( "id", "unknown" );
- 			root.appendChild( cat );
- 			
  			String url = urlForPage( station_id, time_reference );
  			if ( url != null ) {
  				Reader r = getReaderFor( url );
  				EuroTVTokenizer t = new EuroTVTokenizer( r, time_reference );
--- 77,86 ----
  	{
  		try {
  			String url = urlForPage( station_id, time_reference );
  			if ( url != null ) {
+ 				Element cat = doc.createElement( "theme" );
+ 				cat.setAttribute( "id", "unknown" );
+ 				root.appendChild( cat );
+ 			
  				Reader r = getReaderFor( url );
  				EuroTVTokenizer t = new EuroTVTokenizer( r, time_reference );
***************
*** 92,96 ****
  			x.printStackTrace();
  		}
- 	
  		return 0;
  	}
--- 92,95 ----
***************
*** 102,106 ****
  		Document doc, Node root, Calendar time_reference )
  	{
! // categories
  		// <id>1 (movie)
  		// <id>2 (serie)
--- 101,105 ----
  		Document doc, Node root, Calendar time_reference )
  	{
! 		// categories
  		// <id>1 (movie)
  		// <id>2 (serie)
***************
*** 139,147 ****
  
  
! 
  	private String urlForPage( String station_id, Calendar time_reference )
  	{
- // find page for specified day
- // url for index = sl<id>
  		String day_page = null;
  		String url = s_urlBase + "/sl" + station_id + ".htm";
--- 138,144 ----
  
  
! 	/* searches for url for specified day in index page sl<id> */
  	private String urlForPage( String station_id, Calendar time_reference )
  	{
  		String day_page = null;
  		String url = s_urlBase + "/sl" + station_id + ".htm";
***************
*** 162,167 ****
  						Calendar page_cal = Tokenizer.fixDate( page_date, time_reference );
  						if ( (page_cal.get( Calendar.DAY_OF_MONTH ) == time_reference.get( Calendar.DAY_OF_MONTH ) ) &&
! 							(page_cal.get( Calendar.MONTH ) == time_reference.get( Calendar.MONTH ) ) )
  							break;
  					}
  					day_page = null;
--- 159,165 ----
  						Calendar page_cal = Tokenizer.fixDate( page_date, time_reference );
  						if ( (page_cal.get( Calendar.DAY_OF_MONTH ) == time_reference.get( Calendar.DAY_OF_MONTH ) ) &&
! 							(page_cal.get( Calendar.MONTH ) == time_reference.get( Calendar.MONTH ) ) ) {
  							break;
+ 						}
  					}
  					day_page = null;

Index: EuroTVTokenizer.java
===================================================================
RCS file: /cvsroot/wepg/parsers/gparse/EuroTVTokenizer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EuroTVTokenizer.java	5 May 2002 12:12:52 -0000	1.1.1.1
--- EuroTVTokenizer.java	1 Jan 2004 10:52:12 -0000	1.2
***************
*** 14,18 ****
  public class EuroTVTokenizer extends EuroTVTokBase
  {
! 	private static final int ETS_SCANDATE = 1;
  	private static final int ETS_SCANTIME = 2;
  	private static final int ETS_TITLE = 3;
--- 14,18 ----
  public class EuroTVTokenizer extends EuroTVTokBase
  {
! //	private static final int ETS_SCANDATE = 1;
  	private static final int ETS_SCANTIME = 2;
  	private static final int ETS_TITLE = 3;
***************
*** 34,38 ****
  		prg_info = new StringBuffer();
  		
! 		setState( ETS_SCANDATE );
  	}
  
--- 34,38 ----
  		prg_info = new StringBuffer();
  		
! 		setState( ETS_SCANTIME );
  	}
  
***************
*** 41,44 ****
--- 41,45 ----
  	{
  		while (true) switch ( m_state ) {
+ /*
  			case ETS_SCANDATE:
  				if ( segmentize( m_segBuf ) == ETT_EOF )
***************
*** 47,51 ****
  					; // nop
  				break;
! 			case ETS_SCANTIME:
  			case ETS_TITLE:
  			case ETS_INFO:
--- 48,52 ----
  					; // nop
  				break;
! */			case ETS_SCANTIME:
  			case ETS_TITLE:
  			case ETS_INFO:
***************
*** 112,116 ****
  		return null;
  	}
! 	
  	private boolean scanDate()
  	{
--- 113,118 ----
  		return null;
  	}
! 
! /*	
  	private boolean scanDate()
  	{
***************
*** 124,128 ****
  		return false;
  	}
! 
  
  	private boolean scanTime()
--- 126,130 ----
  		return false;
  	}
! */
  
  	private boolean scanTime()
***************
*** 183,184 ****
--- 185,187 ----
  	}
  }
+