FCL/sf/mw/mds: comparison harvester/client/src/harvesterclient.cpp

equal deleted inserted replaced

-:aa5a574040a4
+:a93990e5815e
 #include <e32property.h>
 #include "harvesterclient.h"
 #include "harvestercommon.h"
 #include "harvesterrequestqueue.h"
+#include "harvesternotificationqueue.h"
 #include "harvestereventobserverao.h"
 #include "harvesterlog.h"
 #include "harvesterclientao.h"
 #include "harvestersessionwatcher.h"
 #include "mdsutils.h"
 EXPORT_C RHarvesterClient::RHarvesterClient() : RSessionBase()
 {
 WRITELOG( "RHarvesterClient::RHarvesterClient() - Constructor" );
 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_RHARVESTERCLIENT, "RHarvesterClient::RHarvesterClient" );
-iHarvesterClientAO = NULL;
 iObserver = NULL;
 iHEO = NULL;
 iRequestQueue = NULL;
+iNotificationQueue = NULL;
 }
 // ----------------------------------------------------------------------------------------
 // Connect
 // ----------------------------------------------------------------------------------------
 //
 EXPORT_C TInt RHarvesterClient::Connect()
 {
 WRITELOG( "RHarvesterClient::Connect()" );
 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CONNECT, "RHarvesterClient::Connect" );
 RProperty property;
 const TInt error( property.Attach( KHarvesterPSShutdown, KShutdown, EOwnerThread ) );
 TInt value = 0;
 property.Get( value );
 if ( error != KErrNone || value > KErrNone )
 {
 return KErrLocked;
 }
-if( iHarvesterClientAO )
+if( iRequestQueue )
 	{
 	return KErrAlreadyExists;
 	}
-TRAPD( err, iHarvesterClientAO = CHarvesterClientAO::NewL(*this) );
-if ( err != KErrNone )
-{
-WRITELOG( "RHarvesterClient::RHarvesterClient() - Couldn't create active object" );
-return err;
-}
 // request processor
-TRAP( err, iRequestQueue = CHarvesterRequestQueue::NewL() )
+TRAPD( err, iRequestQueue = CHarvesterRequestQueue::NewL() )
 {
 if ( err != KErrNone )
 {
 WRITELOG( "RHarvesterClient::RHarvesterClient() - Couldn't create harvester request queue" );
-delete iHarvesterClientAO;
+return err;
-iHarvesterClientAO = NULL;
+}
+}
+// request processor
+TRAP( err, iNotificationQueue = CHarvesterNotificationQueue::NewL() )
+{
+if ( err != KErrNone )
+{
+WRITELOG( "RHarvesterClient::RHarvesterClient() - Couldn't create harvester notification queue" );
+delete iRequestQueue;
+iRequestQueue = NULL;
 return err;
 }
 }
 err = ::StartServer();
 WRITELOG( "RHarvesterClient::Connect() - creating session" );
 err = CreateSession( KHarvesterServerName, Version(), KDefaultMessageSlots );
 }
 else
 {
-delete iHarvesterClientAO;
-iHarvesterClientAO = NULL;
 delete iRequestQueue;
 iRequestQueue = NULL;
+delete iNotificationQueue;
+iNotificationQueue = NULL;
 }
 #ifdef _DEBUG
 if ( err != KErrNone )
 {
 delete iSessionWatcher;
 iSessionWatcher = NULL;
 // cancels Harvest Complete request if it exist at server
 UnregisterHarvestComplete();
+delete iNotificationQueue;
+iNotificationQueue = NULL;
 WRITELOG( "RHarvesterClient::Close() - UnregisterHarvest done" );
 if( iRequestQueue && iRequestQueue->RequestsPending() )
 {
 }
 delete iRequestQueue;
 iRequestQueue = NULL;
-delete iHarvesterClientAO;
-iHarvesterClientAO = NULL;
 delete iHEO;
 iHEO = NULL;
 WRITELOG( "RHarvesterClient::Close() - Closing session" );
 EXPORT_C void RHarvesterClient::SetObserver( MHarvestObserver* aObserver )
 {
 WRITELOG( "RHarvesterClient::SetObserver()" );
 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_SETOBSERVER, "RHarvesterClient::SetObserver" );
-if ( iHarvesterClientAO )
-{
-iHarvesterClientAO->SetObserver( aObserver );
-}
 	iObserver = aObserver;
+	iNotificationQueue->SetObserver( iObserver );
 }
 // ----------------------------------------------------------------------------------------
 // RemoveObserver
 // ----------------------------------------------------------------------------------------
 EXPORT_C void RHarvesterClient::RemoveObserver( MHarvestObserver* aObserver )
 {
 WRITELOG( "RHarvesterClient::RemoveObserver()" );
 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REMOVEOBSERVER, "RHarvesterClient::RemoveObserver" );
-if ( iHarvesterClientAO )
-{
-iHarvesterClientAO->RemoveObserver( aObserver );
-}
 	if ( aObserver == iObserver )
 		{
-		if ( iObserver )
+		WRITELOG( "RHarvesterClient::RemoveObserver() - deleting observer" );
-			{
+		iObserver = NULL;
-			WRITELOG( "CHarvesterClientAO::RemoveObserver() - deleting observer" );
+		iNotificationQueue->SetObserver( iObserver );
-			iObserver = NULL;
-			}
 		}
 }
 // ----------------------------------------------------------------------------------------
 // AddHarvesterEventObserver
 EXPORT_C void RHarvesterClient::HarvestFile( const TDesC& aURI, RArray<TItemId>& aAlbumIds, TBool aAddLocation )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - file %S", &aURI );
 OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_HARVESTFILE, "RHarvesterClient::HarvestFile" );
 HBufC8* paramBuf = NULL;
 TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) );
 if ( err )
 	{
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot create serialized array, error: %d", err );
 }
 	return;
 	}
 CHarvesterRequestActive* harvestFileActive( NULL );
-TRAP( err, harvestFileActive = CHarvesterRequestActive::NewL( *this, iObserver, (TInt)EHarvestFile, aURI,
+TRAP( err, harvestFileActive = CHarvesterRequestActive::NewL( *this, (TInt)EHarvestFile, aURI,
 paramBuf, aAddLocation, iRequestQueue ) );
 if( err )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot create harvesting request, error: %d", err );
 if( iObserver )
 if( err && iObserver)
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrServerBusy );
 iObserver->HarvestingComplete( const_cast<TDesC&>(aURI), KErrServerBusy );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else if( err )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrServerBusy );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else
 {
 WRITELOG( "RHarvesterClient::HarvestFile() - harvesting request added to queue" );
 iRequestQueue->Process();
 else if( iObserver )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrDisconnected );
 iObserver->HarvestingComplete( const_cast<TDesC&>(aURI), KErrDisconnected );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrDisconnected );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 WRITELOG( "RHarvesterClient::HarvestFile() - end" );
 }
 // ----------------------------------------------------------------------------------------
 }
 return;
 }
 CHarvesterRequestActive* harvestFileActive( NULL );
-TRAP( err, harvestFileActive = CHarvesterRequestActive::NewL( *this, iObserver, (TInt)EHarvestFile, aURI,
+TRAP( err, harvestFileActive = CHarvesterRequestActive::NewL( *this, (TInt)EHarvestFile, aURI,
 paramBuf, aAddLocation, iRequestQueue ) );
 if( err )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot create harvesting request, error: %d", err );
 if( iObserver )
 if( err && iObserver)
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrServerBusy );
 iObserver->HarvestingComplete( const_cast<TDesC&>(aURI), KErrServerBusy );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else if( err )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrServerBusy );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else
 {
 iRequestQueue->Process();
 }
 else if( iObserver )
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrDisconnected );
 iObserver->HarvestingComplete( const_cast<TDesC&>(aURI), KErrDisconnected );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 else
 {
 WRITELOG1( "RHarvesterClient::HarvestFile() - cannot not send harvest request to server, error: %d", KErrDisconnected );
 delete harvestFileActive;
+harvestFileActive = NULL;
 }
 }
 // ----------------------------------------------------------------------------------------
 // AddSessionObserver
 //
 void RHarvesterClient::RegisterHarvestComplete(TDes& aURI, TRequestStatus& aStatus)
 	{
 	TIpcArgs ipcArgs( &aURI );
 	OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REGISTERHARVESTCOMPLETE, "RHarvesterClient::RegisterHarvestComplete" );
 	if( !iHandle )
 		{
 		return;
 		}
 	if( !iHandle )
 		{
 		return;
 		}
-	Send( EUnregisterHarvestComplete );
+	SendReceive( EUnregisterHarvestComplete );
 	}
 // ----------------------------------------------------------------------------------------
 // HarvestFile
 // ----------------------------------------------------------------------------------------
 //
-void RHarvesterClient::HarvestFile( TInt& aService, TIpcArgs& aArgs, TRequestStatus& aStatus )
+void RHarvesterClient::HarvestFile( TInt& aService, TIpcArgs& aArgs, TRequestStatus& aStatus, TDesC& aUri )
 {
 // send to server harvesting complete observer
-iHarvesterClientAO->Active();
+if( iObserver )
+{
+CHarvesterClientAO* harvestNotificationRequest( NULL );
+TRAPD( err, harvestNotificationRequest = CHarvesterClientAO::NewL(*this, iNotificationQueue ) );
+if( err )
+{
+WRITELOG1( "RHarvesterClient::HarvestFile() - cannot issue harvesting notitification request, error: %d", err );
+iObserver->HarvestingComplete( const_cast<TDesC&>(aUri), KErrCompletion );
+delete harvestNotificationRequest;
+harvestNotificationRequest = NULL;
+}
+else
+{
+TRAP( err, iNotificationQueue->AddRequestL( harvestNotificationRequest ) );
+if( err )
+{
+iObserver->HarvestingComplete( const_cast<TDesC&>(aUri), KErrCompletion );
+delete harvestNotificationRequest;
+harvestNotificationRequest = NULL;
+}
+else
+{
+harvestNotificationRequest->SetObserver( iObserver );
+harvestNotificationRequest->Active( aUri );
+}
+}
+}
 SendReceive( aService, aArgs, aStatus );
 }
 // ----------------------------------------------------------------------------------------
 // ForceHarvestFile
 // ----------------------------------------------------------------------------------------
 //
 void RHarvesterClient::ForceHarvestFile( TInt& aService, TIpcArgs& aArgs )
 {
-// send to server harvesting complete observer
-iHarvesterClientAO->Active();
 SendReceive( aService, aArgs );
 }
 // ----------------------------------------------------------------------------------------
 // Version

changeset 45	a93990e5815e
parent 36	aa5a574040a4
child 52	40db28bb26b8