Author: duncan
Date: Tue Mar 11 03:06:14 2008
New Revision: 10500
Log:
[ 1910667 ] Webserver crash when searching
Fix applied
Also make the messages and messages consistent
Modified:
branches/rel-1/freevo/src/tv/record_client.py
branches/rel-1/freevo/src/www/htdocs/favorites.rpy
branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy
branches/rel-1/freevo/src/www/htdocs/record.rpy
branches/rel-1/freevo/src/www/htdocs/search.rpy
branches/rel-1/freevo/src/www/htdocs/wap_rec.rpy
Modified: branches/rel-1/freevo/src/tv/record_client.py
==============================================================================
--- branches/rel-1/freevo/src/tv/record_client.py (original)
+++ branches/rel-1/freevo/src/tv/record_client.py Tue Mar 11 03:06:14 2008
@@ -178,7 +178,7 @@
try:
inprogress = self.recordserver_rpc('ping')
if inprogress is None:
- return None
+ return False
inprogress.wait()
result = inprogress.get_result()
_debug_('pingNow.result=%r' % (result,), 1)
Modified: branches/rel-1/freevo/src/www/htdocs/favorites.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/favorites.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/favorites.rpy Tue Mar 11 03:06:14 2008
@@ -54,8 +54,8 @@
server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Favorites'), 'styles/main.css',
selected=_('Favorites'))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
- return String( fv.res )
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>:
'+self.recordclient.recordserverdown])
+ return String(fv.res)
action = fv.formValue(form, 'action')
oldname = fv.formValue(form, 'oldname')
Modified: branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/manualrecord.rpy Tue Mar 11
03:06:14 2008
@@ -72,7 +72,7 @@
server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Manual Record'),
'styles/main.css',selected=_("Manual Record"))
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>:
'+self.recordclient.recordserverdown])
return String(fv.res)
curtime_epoch = time.time()
Modified: branches/rel-1/freevo/src/www/htdocs/record.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/record.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/record.rpy Tue Mar 11 03:06:14 2008
@@ -56,10 +56,10 @@
action = fv.formValue(form, 'action')
server_available = self.recordclient.pingNow()
- if server_available is None:
- fv.printHeader('Scheduled Recordings', 'styles/main.css')
- fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>: '+_('Recording
server is not available')])
- return String( fv.res )
+ if not server_available:
+ fv.printHeader(_('Scheduled Recordings'), 'styles/main.css')
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>:
'+self.recordclient.recordserverdown])
+ return String(fv.res)
if action == 'remove':
(status, schedule) = self.recordclient.getScheduledRecordingsNow()
Modified: branches/rel-1/freevo/src/www/htdocs/search.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/search.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/search.rpy Tue Mar 11 03:06:14 2008
@@ -49,15 +49,11 @@
fv = HTMLResource()
form = request.args
- (server_available, message) = self.recordclient.pingNow()
+ server_available = self.recordclient.pingNow()
if not server_available:
fv.printHeader(_('Search Results'), 'styles/main.css',
selected=_('Search'))
- fv.res += '<h4>'+_('ERROR')+': '+_('Recording server is not
available')+'</h4>'
- fv.printAdvancedSearchForm()
- fv.printLinks()
- fv.printFooter()
-
- return String( fv.res )
+ fv.printMessagesFinish(['<b>'+_('ERROR')+'</b>:
'+self.recordclient.recordserverdown])
+ return String(fv.res)
find = fv.formValue(form, 'find')
if fv.formValue(form, 'movies_only'):
Modified: branches/rel-1/freevo/src/www/htdocs/wap_rec.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/wap_rec.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/wap_rec.rpy Tue Mar 11 03:06:14 2008
@@ -100,7 +100,7 @@
server_available = self.recordclient.pingNow()
if not server_available:
- fv.res += '<p>ERROR: Record Server offline</p>\n'
+ fv.res += '<p>'+_('ERROR')+':
'+self.recordclient.recordserverdown+'</p>\n'
else:
fv.res += ' <p>Record Server online!</p>\n'
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
