Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30010/system
Modified Files:
pages.py
Log Message:
fixed foreign characters in page system.
fixed bandages for logged out chars
Index: pages.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pages.py 20 Sep 2004 14:29:55 -0000 1.5
--- pages.py 8 Oct 2004 11:05:53 -0000 1.6
***************
*** 7,10 ****
--- 7,11 ----
import time
from urllib import quote, unquote
+ from wolfpack import console
pages = None
***************
*** 30,45 ****
if type(char) == str:
values = char.split(';')
! self.account = unquote( values[0] )
self.serial = int(values[1])
! self.name = unquote(values[2])
(x, y, z, m) = values[3].split(',')
self.pos = wolfpack.coord(int(x), int(y), int(z), int(m))
! self.category = unquote(values[4])
self.message = ['', '', '', '']
! self.message[0] = unicode(unquote(values[5]))
! self.message[1] = unicode(unquote(values[6]))
! self.message[2] = unicode(unquote(values[7]))
! self.message[3] = unicode(unquote(values[8]))
! self.created = float(values[9])
else:
self.account = char.account.name
--- 31,46 ----
if type(char) == str:
values = char.split(';')
! self.account = unquote( values[0] ).decode('utf-8')
self.serial = int(values[1])
! self.name = unquote(values[2]).decode('utf-8')
(x, y, z, m) = values[3].split(',')
self.pos = wolfpack.coord(int(x), int(y), int(z), int(m))
! self.category = unquote(values[4]).decode('utf-8')
self.message = ['', '', '', '']
! self.message[0] = unquote(values[5]).decode('utf-8')
! self.message[1] = unquote(values[6]).decode('utf-8')
! self.message[2] = unquote(values[7]).decode('utf-8')
! self.message[3] = unquote(values[8]).decode('utf-8')
! self.created = float(values[9])
else:
self.account = char.account.name
***************
*** 48,52 ****
self.pos = char.pos
self.category = ''
! self.message = ['', '', '', '']
self.created = 0
--- 49,53 ----
self.pos = char.pos
self.category = ''
! self.message = [u'', u'', u'', u'']
self.created = 0
***************
*** 71,83 ****
def tostring(self):
values = []
! values.append( quote( self.account ) )
values.append( str( self.serial ) )
! values.append( quote( self.name ) )
values.append( '%d,%d,%d,%d' % ( self.pos.x, self.pos.y, self.pos.z, self.pos.map ) )
! values.append( quote( self.category ) )
! values.append( quote( self.message[0] ) )
! values.append( quote( self.message[1] ) )
! values.append( quote( self.message[2] ) )
! values.append( quote( self.message[3] ) )
values.append( str( self.created ) )
return ";".join(values)
--- 72,84 ----
def tostring(self):
values = []
! values.append( quote( self.account.encode('utf-8') ) )
values.append( str( self.serial ) )
! values.append( quote( self.name.encode('utf-8') ) )
values.append( '%d,%d,%d,%d' % ( self.pos.x, self.pos.y, self.pos.z, self.pos.map ) )
! values.append( quote( self.category.encode('utf-8') ) )
! values.append( quote( self.message[0].encode('utf-8') ) )
! values.append( quote( self.message[1].encode('utf-8') ) )
! values.append( quote( self.message[2].encode('utf-8') ) )
! values.append( quote( self.message[3].encode('utf-8') ) )
values.append( str( self.created ) )
return ";".join(values)
|
