Author: rshortt
Date: Sat Mar 18 13:49:14 2006
New Revision: 8093
Modified:
trunk/core/src/ipc/epg.py
trunk/ui/src/tv/program.py
trunk/webserver/src/pages/proginfo.py
Log:
epg2 -> epg
Modified: trunk/core/src/ipc/epg.py
==============================================================================
--- trunk/core/src/ipc/epg.py (original)
+++ trunk/core/src/ipc/epg.py Sat Mar 18 13:49:14 2006
@@ -40,7 +40,7 @@
import os
from kaa.config import Var, Group, Dict, List, Config
-import kaa.epg2
+import kaa.epg
# FIXME: create logger objects in conf
import freevo.conf
@@ -54,7 +54,7 @@
Var(name='log_level', type=('CRITICAL', 'ERROR', 'WARNING', 'INFO',
'DEBUG'),
default='WARNING',
desc=_('The log level of the server: CRITICAL, ERROR, WARNING, INFO,
DEBUG.')),
- Var(name='database', default='%s/epg2.db' % freevo.conf.DATADIR,
+ Var(name='database', default='%s/epg.db' % freevo.conf.DATADIR,
desc=_('Filename for the sqlite database file')),
Var(name='address', default='',
desc=_('Address for remote access to EPG server. This is disabled\n'
@@ -131,10 +131,10 @@
loglevel = getattr(logging, config.log_level)
- guide = kaa.epg2.connect(config.database, address,
- logfile='%s/epgserver-%s' % \
- (freevo.conf.LOGDIR, os.getuid()),
- loglevel=loglevel)
+ guide = kaa.epg.connect(config.database, address,
+ logfile='%s/epgserver-%s' % \
+ (freevo.conf.LOGDIR, os.getuid()),
+ loglevel=loglevel)
return guide
Modified: trunk/ui/src/tv/program.py
==============================================================================
--- trunk/ui/src/tv/program.py (original)
+++ trunk/ui/src/tv/program.py Sat Mar 18 13:49:14 2006
@@ -35,7 +35,7 @@
import time
# kaa imports
-import kaa.epg2
+import kaa.epg
# freevo core imports
import freevo.ipc
@@ -103,7 +103,7 @@
"""
compare function, return 0 if the objects are identical, 1 otherwise
"""
- if not isinstance(other, (ProgramItem, kaa.epg2.Program)):
+ if not isinstance(other, (ProgramItem, kaa.epg.Program)):
return 1
return self.title != other.title or \
Modified: trunk/webserver/src/pages/proginfo.py
==============================================================================
--- trunk/webserver/src/pages/proginfo.py (original)
+++ trunk/webserver/src/pages/proginfo.py Sat Mar 18 13:49:14 2006
@@ -72,7 +72,7 @@
if MAX_DESCRIPTION_CHAR and len(desc) > MAX_DESCRIPTION_CHAR:
desc=desc[:desc[:MAX_DESCRIPTION_CHAR].rfind('.')] + '. [...]'
- # TODO: add subtitle to kaa.epg2
+ # TODO: add subtitle to kaa.epg
#if prog.subtitle:
# desc = '"%s"<br/>%s' % (prog.subtitle, desc)
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
