Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29632
Modified Files:
recordserver.py
Log Message:
start some unicode fixes, still not working every time
Index: recordserver.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** recordserver.py 11 Feb 2004 04:20:46 -0000 1.30
--- recordserver.py 23 Feb 2004 21:46:22 -0000 1.31
***************
*** 7,10 ****
--- 7,13 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.31 2004/02/23 21:46:22 dischi
+ # start some unicode fixes, still not working every time
+ #
# Revision 1.30 2004/02/11 04:20:46 outlyer
# Yet another place where we aren't following the user's time format... fixed now.
***************
*** 204,210 ****
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! if DEBUG: log.debug('GET: reading cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! scheduledRecordings =
marmalade.unjellyFromXML(open(config.TV_RECORD_SCHEDULE, 'r'))
!
try:
file_ver = scheduledRecordings.TYPES_VERSION
--- 207,216 ----
if os.path.isfile(config.TV_RECORD_SCHEDULE):
! if DEBUG:
! log.debug('GET: reading cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! f = open(config.TV_RECORD_SCHEDULE, 'r')
! scheduledRecordings = marmalade.unjellyFromXML(f)
! f.close()
!
try:
file_ver = scheduledRecordings.TYPES_VERSION
***************
*** 239,245 ****
scheduledRecordings = ScheduledRecordings()
! if DEBUG: log.debug('SAVE: saving cached file (%s)' %
config.TV_RECORD_SCHEDULE)
! if DEBUG: log.debug("SAVE: ScheduledRecordings has %s items." %
len(scheduledRecordings.programList))
! marmalade.jellyToXML(scheduledRecordings, open(config.TV_RECORD_SCHEDULE,
'w'))
return TRUE
--- 245,256 ----
scheduledRecordings = ScheduledRecordings()
! if DEBUG:
! log.debug('SAVE: saving cached file (%s)' % config.TV_RECORD_SCHEDULE)
! if DEBUG:
! log.debug("SAVE: ScheduledRecordings has %s items." % \
! len(scheduledRecordings.programList))
! f = open(config.TV_RECORD_SCHEDULE, 'w')
! marmalade.jellyToXML(scheduledRecordings, f)
! f.close()
return TRUE
***************
*** 319,323 ****
if start == '%s' % prog.start:
if DEBUG: log.debug('PROGRAM MATCH')
! return (TRUE, prog)
return (FALSE, 'prog not found')
--- 330,334 ----
if start == '%s' % prog.start:
if DEBUG: log.debug('PROGRAM MATCH')
! return (TRUE, prog.decode())
return (FALSE, 'prog not found')
***************
*** 347,352 ****
if regex.match(prog.title) or regex.match(prog.desc) \
or regex.match(prog.sub_title):
! if DEBUG: log.debug('PROGRAM MATCH: %s' % prog)
! matches.append(prog)
if matches:
--- 358,367 ----
if regex.match(prog.title) or regex.match(prog.desc) \
or regex.match(prog.sub_title):
! if DEBUG:
! log.debug('PROGRAM MATCH: %s' % prog)
! matches.append(prog.decode())
!
! if DEBUG:
! log.debug('return: %s' % str(matches))
if matches:
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
