SF.net SVN: fclient: [436] trunk/sandbox/fcp2/client.py

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

Revision: 436
          http://fclient.svn.sourceforge.net/fclient/?rev=436&view=rev
Author:   jUrner
Date:     2008-06-30 02:12:16 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
fix for PutDiskDir vs PutComplexDir on restore

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

Modified: trunk/sandbox/fcp2/client.py
===================================================================
--- trunk/sandbox/fcp2/client.py	2008-06-30 08:58:39 UTC (rev 435)
+++ trunk/sandbox/fcp2/client.py	2008-06-30 09:12:16 UTC (rev 436)
@@ -876,7 +876,6 @@
 			
 			# unknown request... try to restore it
 			if initialRequest is None:
-				
 				if CancelPersistentRequests:
 					self.sendMessage(
 							message.RemovePersistentRequest(
@@ -891,22 +890,16 @@
 				requestType = msg['RequestType']
 				if requestType & consts.RequestType.MaskGet:
 					initialRequest = message.ClientGet()
-				
-				#FIXME: does not work as expected
-				# ClientPutdiskDir is just a subtype of ClientPutComplexDir
-				# items will be passed as Files.N.* container
-				
-				elif requestType == consts.RequestType.PutMultiple:
+				elif requestType & (onsts.RequestType.PutDir | consts.RequestType.PutMultiple):
+					#NOTE: PutDiskDir is just a subtype of PutComplexDir
 					initialRequest = message.ClientPutComplexDir()
-				elif requestType == consts.RequestType.PutDir:
-					initialRequest = message.ClientPutdiskDir()
 				else:
 					initialRequest = message.ClientPut()
 					
 				initialRequest.params.update(msg.params)
 				self._requests[initialRequest['Identifier']] = initialRequest
 					
-				#FIX: remove Started param from PersistentGet / Put
+				#FIX: remove Started param from PersistentGet / Put, not interesting
 				if 'Started' in initialRequest.params:
 					del initialRequest.params['Started']
 				initialRequest['RequestStatus'] |= consts.RequestStatus.Restored


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