[simias-svn] SF.net SVN: simias:[7361] trunk/src/webservices/iFolderUserDetails.cs

[<mv...@us...>]

Revision: 7361
          http://simias.svn.sourceforge.net/simias/?rev=7361&view=rev
Author:   mvikash
Date:     2010-05-12 05:25:28 +0000 (Wed, 12 May 2010)

Log Message:
-----------
changes are done to handle ifolder limit policy voilation in Multi
server environment. 

Modified Paths:
--------------
    trunk/src/webservices/iFolderUserDetails.cs

Modified: trunk/src/webservices/iFolderUserDetails.cs
===================================================================
--- trunk/src/webservices/iFolderUserDetails.cs	2010-05-12 05:22:35 UTC (rev 7360)
+++ trunk/src/webservices/iFolderUserDetails.cs	2010-05-12 05:25:28 UTC (rev 7361)
@@ -37,6 +37,7 @@
 using Simias.Client;
 using Simias.Storage;
 using Simias.Web;
+using Simias.Server;
 
 namespace iFolder.WebService
 {
@@ -127,12 +128,12 @@
 
 
 			if ( member.HomeServer != null )
-                this.DetailHomeServer = (member.HomeServer.Name == null ) ? string.Empty : member.HomeServer.Name;
-            else
-                this.DetailHomeServer = string.Empty;	
-             int state = member.UserMoveState;
-	    	 switch(state)
-		     {
+                		this.DetailHomeServer = (member.HomeServer.Name == null ) ? string.Empty : member.HomeServer.Name;
+            		else
+                		this.DetailHomeServer = string.Empty;	
+             		int state = member.UserMoveState;
+	    	 	switch(state)
+		     	{
 		             case (int)Member.userMoveStates.Nousermove:
 		             case (int)Member.userMoveStates.Initialized:
 		                       DetailDataMoveStatus = "Initializing";
@@ -158,40 +159,40 @@
 		                        DetailDataMovePercentage = 0;
 			                    DetailDataMoveStatus = "Initializing";
 			                   break;
-		     }
+		     	}
 			 if( state < (int)Member.userMoveStates.DataMoveStarted)
 					    DetailDataMovePercentage += 0;
 			 else if( state > (int)Member.userMoveStates.DataMoveStarted)
 					    DetailDataMovePercentage += 80;
 			 else
-			   {
-                    Store stored = Store.GetStore();
-					long SpaceUsed = 0;
-					long DataTransferred  = 1;
-					int iFolderMoveState = 0;
-					ICSList collectionList = stored.GetCollectionsByOwner( member.UserID, domain.ID );
-					foreach ( ShallowNode sn in collectionList )
-					{
-					    Collection iFolderCol = new Collection( stored, sn );
-						SpaceUsed += iFolderCol.StorageSize;
-						iFolderMoveState = member.iFolderMoveState(domain.ID, false, iFolderCol.ID, 0, 0);
-						if(iFolderMoveState  > 1 )
-						{
-								DataTransferred += iFolderCol.StorageSize;
-						}
-					}
-					if(SpaceUsed != 0)
-							DetailDataMovePercentage += (int)(( 80 * DataTransferred ) / SpaceUsed );
-					else
-							DetailDataMovePercentage += 80;
+			 {
+				 Store stored = Store.GetStore();
+				 long SpaceUsed = 0;
+				 long DataTransferred  = 1;
+				 int iFolderMoveState = 0;
+				 ICSList collectionList = stored.GetCollectionsByOwner( member.UserID, domain.ID );
+				 foreach ( ShallowNode sn in collectionList )
+				 {
+					 Collection iFolderCol = new Collection( stored, sn );
+					 SpaceUsed += iFolderCol.StorageSize;
+					 iFolderMoveState = member.iFolderMoveState(domain.ID, false, iFolderCol.ID, 0, 0);
+					 if(iFolderMoveState  > 1 )
+					 {
+						 DataTransferred += iFolderCol.StorageSize;
+					 }
+				 }
+				 if(SpaceUsed != 0)
+					 DetailDataMovePercentage += (int)(( 80 * DataTransferred ) / SpaceUsed );
+				 else
+					 DetailDataMovePercentage += 80;
 			   }
 			 if ( member.NewHomeServer != null )
 			 {
-					 HostNode newHomeNode = HostNode.GetHostByID(domain.ID, member.NewHomeServer);
-					 if(newHomeNode != null)
-							 this.DetailNewHomeServer = (newHomeNode.Name == null ) ? string.Empty : newHomeNode.Name;
-					 else
-							 this.DetailNewHomeServer = string.Empty;
+				 HostNode newHomeNode = HostNode.GetHostByID(domain.ID, member.NewHomeServer);
+				 if(newHomeNode != null)
+					 this.DetailNewHomeServer = (newHomeNode.Name == null ) ? string.Empty : newHomeNode.Name;
+				 else
+					 this.DetailNewHomeServer = string.Empty;
 			 }
 			 else
 					 this.DetailNewHomeServer = string.Empty;
@@ -251,23 +252,16 @@
 			}
 
 			// Get the number of iFolders owned and shared by the user.
-			Store store = Store.GetStore();
-			ICSList ifList = store.GetCollectionsByUser(this.ID);
-			foreach ( ShallowNode sn in ifList )
+			CatalogEntry[] catalogEntries;
+			catalogEntries = Catalog.GetAllEntriesByUserID(this.ID);
+			foreach(CatalogEntry ce in catalogEntries)
 			{
-				Collection c = new Collection( store, sn );
-				if ( c.IsType( "iFolder" ) )
-				{
-					if ( c.Owner.UserID == this.ID )
-					{
-						++OwnediFolderCount;
-					}
-					else
-					{
-						++SharediFolderCount;
-					}
-				}
-			}
+				if(ce.OwnerID == this.ID)
+					++OwnediFolderCount;	
+				else
+					++SharediFolderCount;				
+			}		
+
 		}
 
 


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