FCL/sf/mw/socialmobilefw: comparison smf/smfservermodule/smfserver/server/smfserversymbian.cpp

equal deleted inserted replaced

-:1cee9f1b95e0
+:a180113055cb
 #include <QDataStream>
 #include <QDebug>
 #include <smfrelationmgr.h>
+#include "smfpluginmanager.h"
 #include "smfserversymbian_p.h"
 SmfServerSymbian* SmfServerSymbian::NewL(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper)
 	{
 			iServer(aServer),iPtrToBuf(NULL,0) ,
 			iIntfNameSymbian8(NULL,0), iProviderSymbian8(NULL,0),
 			iIntfNameSymbian(NULL,0) ,iXtraDataPtr8(NULL,0),
 			iPtrToDataForClient(NULL,0) ,iPtr8DataForDSM(NULL,0),iPtr8DataFromDSM(NULL,0)
 	{
-	qDebug()<<"Inside SmfServerSymbianSession::SmfServerSymbianSession()";
 	iServer->iSessionCount++;
 	}
 SmfServerSymbianSession::~SmfServerSymbianSession()
 	{
 	}
 void SmfServerSymbianSession::HandleClientMessageL(const RMessage2& aMessage)
 	{
 	qDebug()<<"Inside SmfServerSymbianSession::HandleClientMessageL() = "<<aMessage.Function();
-	iLastRequest = aMessage.Function();
 	/**Note:- Only ESmfGetService needs to be taken care separately as it doesn't involve createrequest for PM
 	 *See SmfRequestTypeID for list of opcodes
 	 *
 	 *Two cases,-
 	 *so it seems PM needs to provide two overloaded getPlugins API But for every client intf instanciation
 	 *we would execute the same things twice.
 	 *TODO:- to be changed after GetServices returns SmfProvider+pluginID
 	 *
 	 */
-	if( (SmfGetService == iLastRequest) 			||
+	if( (SmfGetService == aMessage.Function()) 			||
-		(SmfPostGetMaxCharsInPost == iLastRequest)	||
+		(SmfPostGetMaxCharsInPost == aMessage.Function())	||
-		(SmfPostGetMaxItems == iLastRequest)		||
+		(SmfPostGetMaxItems == aMessage.Function())		||
-		(SmfPostGetSupportedFormats == iLastRequest)||
+		(SmfPostGetSupportedFormats == aMessage.Function())||
-		(SmfPostGetAppearanceSupport == iLastRequest) )
+		(SmfPostGetAppearanceSupport == aMessage.Function()))
 		{
 		HandleSyncServiceL(aMessage);
 		}
-	else if(iLastRequest == SmfRelationCreate ||
+	else if (SmfCancelRequest == aMessage.Function())
-			iLastRequest == SmfRelationAssociate ||
+		{
-			iLastRequest == SmfRelationSearchById ||
+		HandleCancelRequest(aMessage);
-			iLastRequest == SmfRelationSearchByContact ||
+		}
-			iLastRequest == SmfRelationCount ||
+	else if(aMessage.Function() == SmfRelationCreate ||
-			iLastRequest == SmfRelationGet ||
+			aMessage.Function() == SmfRelationAssociate ||
-			iLastRequest == SmfRelationGetAll ||
+			aMessage.Function() == SmfRelationSearchById ||
-			iLastRequest == SmfRelationGetAllRelations ||
+			aMessage.Function() == SmfRelationSearchByContact ||
-			iLastRequest == SmfRelationDeleteRelation
+			aMessage.Function() == SmfRelationCount ||
+			aMessage.Function() == SmfRelationGet ||
+			aMessage.Function() == SmfRelationGetAll ||
+			aMessage.Function() == SmfRelationGetAllRelations ||
+			aMessage.Function() == SmfRelationDeleteRelation ||
+			aMessage.Function() == SmfRelationRemove
 			)
 		{
 		HandleDSMServiceL(aMessage);
 		}
 	else
 		{
 		HandleCommonServiceL(aMessage);
 		}
 	}
+void SmfServerSymbianSession::HandleCancelRequest(const RMessage2 & aMessage)
+	{
+	SmfError err = SmfNoError;
+	// iLastRequest contains the last operations opcode, cwhich is to be cancelled.
+	bool ret = SmfPluginManager::getInstance(iServer->wrapper())->cancelRequest(iLastRequest);
+	iErrBuf.Zero();
+	iErrBuf.AppendNum(err);
+	iMessage.Write(2,iErrBuf);
+	aMessage.Complete(iLastRequest);
+	}
 void SmfServerSymbianSession::HandleDSMServiceL(const RMessage2 & aMessage)
 	{
 	qDebug()<<"Inside SmfServerSymbianSession::HandleDSMServiceL()";
+	iLastRequest = aMessage.Function();
 	//TODO:-If DSM takes care of deserialization and formation of User and social
 	//profile from the params then switch case can be removed
 	if(iData8ForDSM)
 		{
 		delete iData8ForDSM;
 			TInt readerr0 = aMessage.Read(0,iPtr8DataForDSM);
 			}
 			break;
 		case SmfRelationAssociate:
 			{
-			int maxAlloc = 100;
+			int maxAlloc = 1000;
 			iData8ForDSM = HBufC8::New(maxAlloc);
 			iPtr8DataForDSM.Set(iData8ForDSM->Des());
 			TInt readerr0 = aMessage.Read(0,iPtr8DataForDSM);
 			}
 			break;
 			if(iData8FromDSM)
 				{
 				delete iData8FromDSM;
 				iData8FromDSM = NULL;
 				}
+			int siz = qtdataFromDSM.size();
+			qDebug()<<"Size of Data to be sent back thru DSM Create : "<<siz;
 			iData8FromDSM = HBufC8::NewL(qtdataFromDSM.size());
 			iPtr8DataFromDSM.Set(iData8FromDSM->Des());
 			iPtr8DataFromDSM.Copy(reinterpret_cast<const TText8*>(qtdataFromDSM.constData()),qtdataFromDSM.length());
 			TInt writeErr = aMessage.Write(1,iPtr8DataFromDSM);
 			}
 		iDSMErr.Zero();
 		TInt errInt = dsmErr;
 		iDSMErr.AppendNum(errInt);
 		TInt writeErr = aMessage.Write(2,iDSMErr);
 		}
+	aMessage.Complete(iLastRequest);
 	}
 void SmfServerSymbianSession::HandleSyncServiceL(const RMessage2 & aMessage)
 	{
 	qDebug()<<"Inside SmfServerSymbianSession::HandleSyncServiceL()";
+	iLastRequest = aMessage.Function();
 	// Following is the data format sent by client
 	// 1. SmfProvider +PageInfo flag+ aPageNum + aPerPage (if pageinfoflag is set) + XtraInfo flag(size of xtra data) Serialized
 	// 2. Interface name as string ("org.symbian.smf.client.gallery")
 	// 3. Data pointer to be filled by serialized data(eg: QList<smfProvider>)
 	}
 void SmfServerSymbianSession::HandleCommonServiceL(const RMessage2& aMessage)
 	{
 	qDebug()<<"Inside SmfServerSymbianSession::HandleCommonServiceL() = "<<aMessage.Function();
+	iLastRequest = aMessage.Function();
 	/**
 	 * Note:- client sends message in the following format,-
 	 * Slot 0:- SmfProvider* serialized+Page info flag+page number+per page (if page info flag)+xtra info flag
 	 * Slot 1:- Interface Name buffer
 	 * Slot 2:- Ptr to data block to be filled
 		delete iProviderBuf8;
 		iProviderBuf8 = NULL;
 		}
 	iProviderBuf8 = HBufC8::NewL(providerSize);
 	iProviderSymbian8.Set(iProviderBuf8->Des());
+	qDebug()<<"data info (0) size = "<<iProviderSymbian8.Size();
 	//read it into iProviderSymbian8
 	aMessage.ReadL(0,iProviderSymbian8);
 	//convert SmfProvider info from Symbian into bytearray
 	iIntfNameBuf8 = HBufC8::NewL(intfNameSize);
 	iIntfNameSymbian8.Set(iIntfNameBuf8->Des());
 	//read it into iIntfNameSymbian8
 	aMessage.ReadL(1,iIntfNameSymbian8);
-	qDebug()<<"iIntfNameSymbian8.Size = "<<iIntfNameSymbian8.Size();
+	qDebug()<<"iIntfNameSymbian8 (1) .Size = "<<iIntfNameSymbian8.Size();
 	QByteArray bytearray(reinterpret_cast<const char*>(iIntfNameSymbian8.Ptr()),iIntfNameSymbian8.Length()) ;
 	QDataStream intfNameStream(&bytearray,QIODevice::ReadOnly);
 	iInterfaceID.clear();
 	intfNameStream>>iInterfaceID;
 		//Gnerate request id only if the plugin ID is authorised
 		TInt id = iServer->addToSessionMap(this,aMessage);
 		//request PM to get the data
 		SmfRequestTypeID opcode = (SmfRequestTypeID)iLastRequest;
-		iServer->wrapper()->sendToPluginManager(id,pluginID,iInterfaceID,opcode,XtraBufQt);
+		SmfError err = iServer->wrapper()->sendToPluginManager(id,pluginID,iInterfaceID,opcode,XtraBufQt);
+		if(SmfNoError != err)
+			{
+			iErrBuf.Zero();
+			iErrBuf.AppendNum(err);
+			iMessage.Write(2,iErrBuf);
+			//signal completion for the last request
+			iMessage.Complete(err);
+			}
 		}
 	else
 		{
 		SmfError err = SmfNoAuthorizedPlugin;
 		iErrBuf.Zero();
 		iErrBuf.AppendNum(err);
 		iMessage.Write(2,iErrBuf);
-		}
-	}
+		//signal completion for the last request
+		iMessage.Complete(err);
+		}
+	}

changeset 25	a180113055cb
parent 18	013a02bf2bb0
child 26	83d6a149c755