SF.net SVN: fclient: [366] trunk/sandbox/fcp2/message.py

[<jU...@us...>]

Revision: 366
          http://fclient.svn.sourceforge.net/fclient/?rev=366&view=rev
Author:   jUrner
Date:     2008-03-11 04:20:32 -0700 (Tue, 11 Mar 2008)

Log Message:
-----------
Peristentget fixes and this and that

Modified Paths:
--------------
    trunk/sandbox/fcp2/message.py

Modified: trunk/sandbox/fcp2/message.py
===================================================================
--- trunk/sandbox/fcp2/message.py	2008-03-11 11:19:48 UTC (rev 365)
+++ trunk/sandbox/fcp2/message.py	2008-03-11 11:20:32 UTC (rev 366)
@@ -144,9 +144,7 @@
 			out.append(self.data)
 		return '\n'.join(out)	
 
-
 	
-	
 	def updatePersistentParams(self):
 		pass
 	
@@ -522,6 +520,7 @@
 		PrivateParam('RequestStatus'): consts.RequestStatus.Null,
 		PrivateParam('InitTime'): 0,																# when was the request started?
 		PrivateParam('UserData'): None,
+		PrivateParam('Edition'): -1,
 		}
 
 AdditionalPluginInfoParams = {
@@ -534,7 +533,7 @@
 PersistentParamsGet = (
 		(
 				lambda msg: str(msg.__getitem__('RequestType')),
-				lambda msg, value: msg.__setitem__('Requesttype', int(value)),
+				lambda msg, value: msg.__setitem__('RequestType', int(value)),
 			),
 			(
 				lambda msg: str(msg.__getitem__('InitTime')),
@@ -553,7 +552,7 @@
 PersistentParamsPut = (
 			(
 				lambda msg: str(msg.__getitem__('RequestType')),
-				lambda msg, value: msg.__setitem__('Requesttype', int(value)),
+				lambda msg, value: msg.__setitem__('RequestType', int(value)),
 			),
 			(
 				lambda msg: str(msg.__getitem__('InitTime')),
@@ -619,6 +618,9 @@
 		'DataLength': types.FcpTypeInt,
 		'Global': types.FcpTypeBool,
 		}
+		
+	def _getDataLength(self):
+		return self['DataLength']
 
 
 class ClientGet(MessageBase):
@@ -647,8 +649,8 @@
 		
 	def updatePersistentParams(self):
 		self['ClientToken'] = MessageBase._getPersistentParams(self)
+		
 
-
 class ClientHello(MessageBase):
 	name = consts.Message.ClientHello
 	_additional_params_ = {}
@@ -1070,7 +1072,7 @@
 #######################################
 class PersistentGet(MessageBase):
 	name = consts.Message.PersistentGet
-	_additional_params_ = {}
+	_additional_params_ = AdditionalGetParams
 	_persistent_params_ = PersistentParamsGet
 	_param_types_ = ClientGet._param_types_.copy()
 	_param_types_['Started'] = types.FcpTypeBool


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.