SF.net SVN: fclient: [147] trunk/sandbox/fcp/fcp2_0_client.py

[<ju...@us...>]

Revision: 147
          http://fclient.svn.sourceforge.net/fclient/?rev=147&view=rev
Author:   jurner
Date:     2008-02-05 04:27:18 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
fix: added modified dict to all requests

Modified Paths:
--------------
    trunk/sandbox/fcp/fcp2_0_client.py

Modified: trunk/sandbox/fcp/fcp2_0_client.py
===================================================================
--- trunk/sandbox/fcp/fcp2_0_client.py	2008-02-05 12:26:13 UTC (rev 146)
+++ trunk/sandbox/fcp/fcp2_0_client.py	2008-02-05 12:27:18 UTC (rev 147)
@@ -596,7 +596,7 @@
 		@return: True if the message was handled, False otherwise
 		"""	
 				
-		CancelPersistentRequests = 1		# for testing... if True, cancels all PersistentRequests
+		CancelPersistentRequests = 0		# for testing... if True, cancels all PersistentRequests
 		
 		if msg.name == consts.Message.ClientSocketTimeout:
 			return True
@@ -614,7 +614,13 @@
 			if initialRequest is not None:
 				# resend request with new identifier
 							
-				newIdentifier = self.FcParams.newUuid(uuids=self._requests)
+				#TODO: just an assumption that pugin related messages my end up here
+				if initialRequest.name in (consts.Message.GetPluginInfo, consts.Message.FCPPlugin):
+					identifierPrefix = self.IdentifierPrefixPluginMessage
+				else:
+					identifierPrefix = self.IdentifierPrefixRequest
+				
+				newIdentifier = self.FcParams.newUuid(prefix=identifierPrefix, uuids=self._requests)
 				self._requests[newIdentifier] = initialRequest
 				del self._requests[requestIdentifier]
 				initialRequest['Identifier'] = newIdentifier
@@ -1959,6 +1965,7 @@
 		identifier = self.FcParam.newUuid(prefix=self.IdentifierPrefixPluginMessage, uuids=self._requests)
 		msg = self.Message(
 			consts.Message.GetPluginInfo,
+			FcModified={},
 			Identifier=identifier,
 			PluginName=pluginName,
 			Detailed=detailed,
@@ -1978,6 +1985,7 @@
 		identifier = self.FcParam.newUuid(prefix=self.IdentifierPrefixPluginMessage, uuids=self._requests)
 		msg = self.Message(
 			consts.Message.GetPluginInfo,
+			FcModified={},
 			Identifier=identifier,
 			PluginName=pluginName,
 			**params
@@ -2009,6 +2017,7 @@
 		identifier = self.FcParams.newUuid(prefix=prefix, uuids=self._requests)
 		msg = self.Message(
 				consts.Message.GenerateSSK,
+				FcModified={},
 				Identifier=identifier,
 				)
 		self._requests[identifier] = msg


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