FCL/sf/mw/homescreensrv: comparison contentstorage/caclient/src/caservice.cpp

equal deleted inserted replaced

-:782e3408c2ab
+:82b66994846c
 #include "canotifier.h"
 #include "canotifier_p.h"
 #include "cadefs.h"
 #include "caclientproxy.h"
+#include "caclientnotifierproxy.h"
 #include "caobjectadapter.h"
 #include "caclienttest_global.h"
 // ======== MEMBER FUNCTIONS ========
 \endcode
 For every operations on data is used always one instantiation of a class.
 Below are examples how to create data and work on those ones.
+*/
+/*!
+\var CaServicePrivate::m_q
+Points to the CaService instance that uses this private implementation.
+*/
+/*!
+\var CaServicePrivate::mProxy
+Proxy to communicate with Symbian server.
+*/
+/*!
+\var CaServicePrivate::mErrorCode
+code of error caused by last operation.
+*/
+/*!
+\var CaServicePrivate::mNotifierProxy
+Proxy to client notifier.
 */
 // Initialization of a static member variable.
 QWeakPointer<CaService> CaService::m_instance = QWeakPointer<CaService>();
 /*!
 }
 return removeEntriesFromGroup(group.id(), idList);
 }
 /*!
-Performs touch operation on entry.
-\param entry to be touched
-\retval boolean with result of operation
-*/
-bool CaServicePrivate::touch(const CaEntry &entry)
-{
-qDebug() << "CaServicePrivate::touch" << "entryId: " << entry.id();
-mErrorCode = mProxy->touch(entry);
-qDebug() << "CaServicePrivate::touch mErrorCode:" << mErrorCode;
-return (mErrorCode == NoErrorCode);
-}
-/*!
 Place entries in a given group at the end.
 \param groupId id of a group.
 \param entryId id of entry to append.
 \retval true if operation was successful.
 /*!
 Constructor
 \param servicePublic pointer to public service
 */
 CaServicePrivate::CaServicePrivate(CaService *servicePublic) :
-m_q(servicePublic), mProxy(new CaClientProxy)
+m_q(servicePublic), mProxy(new CaClientProxy),
+mNotifierProxy(NULL)
 {
 const ErrorCode connectionResult = mProxy->connect();
 USE_QWARNING_IF(connectionResult)
 << "CaServicePrivate::CaServicePrivate - unable to connect proxy";
 destructor
 */
 CaServicePrivate::~CaServicePrivate()
 {
 delete mProxy;
+delete mNotifierProxy;
 }
 /*!
 Search for entries.
 \param entryIdList list of entry ids
 // figure out whether all entries have been retrieved and
 // store the operation status
 if (mErrorCode == NoErrorCode
 && entryIdList.count() != resultList.count()) {
 mErrorCode = NotFoundErrorCode;
+}//one line with else if
+else if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+resultList.clear();
+mErrorCode = mProxy->getData(entryIdList, resultList);
+}
 }
 CACLIENTTEST_FUNC_EXIT("CaServicePrivate::getEntries");
 qDebug() << "CaServicePrivate::getEntries mErrorCode:"
 << mErrorCode;
 QList< QSharedPointer<CaEntry> > CaServicePrivate::getEntries(const CaQuery &query) const
 {
 QList< QSharedPointer<CaEntry> > resultList;
 mErrorCode = mProxy->getData(query, resultList);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+resultList.clear();
+mErrorCode = mProxy->getData(query, resultList);
+}
+}
 qDebug() << "CaServicePrivate::getEntries mErrorCode:" << mErrorCode;
 return resultList;
 }
 {
 CACLIENTTEST_FUNC_ENTRY("CaItemModelList::getEntryIds");
 QList<int> resultList;
 mErrorCode = mProxy->getEntryIds(query, resultList);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+resultList.clear();
+mErrorCode = mProxy->getEntryIds(query, resultList);
+}
+}
 CACLIENTTEST_FUNC_EXIT("CaItemModelList::getEntryIds");
 qDebug() << "CaServicePrivate::getEntryIds mErrorCode:" << mErrorCode;
 return resultList;
 }
 const int nonExistingObjectId = 0;
 CaObjectAdapter::setId(*entryClone, nonExistingObjectId);
 addDataResult =
 mProxy->addData(*entryClone, *newEntry);
+if (addDataResult == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+addDataResult =
+mProxy->addData(*entryClone, *newEntry);
+}
+}
 // return empty pointer if nothing was added
 if (addDataResult != NoErrorCode) {
 newEntry.clear();
 }
 return newEntry;
 }
 /*!
+Performs touch operation on entry.
+\param entry to be touched
+\retval boolean with result of operation
+*/
+bool CaServicePrivate::touch(const CaEntry &entry)
+{
+qDebug() << "CaServicePrivate::touch" << "entryId: " << entry.id();
+mErrorCode = mProxy->touch(entry);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+mErrorCode = mProxy->touch(entry);
+}
+}
+qDebug() << "CaServicePrivate::touch mErrorCode:" << mErrorCode;
+return (mErrorCode == NoErrorCode);
+}
+/*!
 Update entry.
 \param entry entry const reference of entry to update
 \retval true if operation was successful
 */
 bool CaServicePrivate::updateEntry(const CaEntry &entry)
 if (entry.id() != 0) {
 try {
 QScopedPointer<CaEntry> updatedEntry(new CaEntry(entry.role()));
 updateEntryResult = mProxy->addData(entry, *updatedEntry);
+if (updateEntryResult == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+updateEntryResult = mProxy->addData(entry, *updatedEntry);
+}
+}
 } catch (const std::bad_alloc &) {
 updateEntryResult = OutOfMemoryErrorCode;
 }
 }
 << "entryIdList: " << entryIdList;
 CACLIENTTEST_FUNC_ENTRY("CaServicePrivate::removeEntries");
 mErrorCode = mProxy->removeData(entryIdList);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+mErrorCode = mProxy->removeData(entryIdList);
+}
+}
 qDebug() << "CaServicePrivate::removeEntries mErrorCode:" << mErrorCode;
 CACLIENTTEST_FUNC_EXIT("CaServicePrivate::removeEntries");
 << "groupId: " << groupId << " beforeEntryId: " << beforeEntryId
 << "entryIdList: " << entryIdList;
 CACLIENTTEST_FUNC_ENTRY("CaServicePrivate::insertEntriesIntoGroup");
-mErrorCode = mProxy->insertEntriesIntoGroup(groupId, entryIdList, beforeEntryId);
+mErrorCode = mProxy->insertEntriesIntoGroup(groupId,
+entryIdList, beforeEntryId);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+mErrorCode = mProxy->insertEntriesIntoGroup(groupId,
+entryIdList, beforeEntryId);
+}
+}
 qDebug() << "CaServicePrivate::insertEntriesIntoGroup mErrorCode:"
 << mErrorCode;
 CACLIENTTEST_FUNC_EXIT("CaServicePrivate::insertEntriesIntoGroup");
 << "groupId: " << groupId << "entryIdList" << entryIdList;
 CACLIENTTEST_FUNC_ENTRY("CaServicePrivate::removeEntriesFromGroup");
 mErrorCode = mProxy->removeEntriesFromGroup(groupId, entryIdList);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+mErrorCode = mProxy->removeEntriesFromGroup(groupId, entryIdList);
+}
+}
 qDebug() << "CaServicePrivate::removeEntriesFromGroup mErrorCode:"
 << mErrorCode;
 CACLIENTTEST_FUNC_EXIT("CaServicePrivate::removeEntriesFromGroup");
 \param CaNotifierFilter which is used be new notifier
 \retval pointer to new Notifier
 */
 CaNotifier *CaServicePrivate::createNotifier(const CaNotifierFilter &filter)
 {
-return new CaNotifier(new CaNotifierPrivate(filter));
+if (!mNotifierProxy) {
+mNotifierProxy = new CaClientNotifierProxy();
+}
+return new CaNotifier(new CaNotifierPrivate(filter, mNotifierProxy));
 }
 /*!
 Set new order of collection's items set by user.
 \param groupId Group id.
 bool CaServicePrivate::customSort(int groupId, QList<int> &entryIdList)
 {
 CACLIENTTEST_FUNC_ENTRY("CaServicePrivate::customSort");
 mErrorCode = mProxy->customSort(entryIdList, groupId);
+if (mErrorCode == ServerTerminated) {
+if (!mProxy->connect()) {
+if (mNotifierProxy) {
+mNotifierProxy->connectSessions();
+}
+mErrorCode = mProxy->customSort(entryIdList, groupId);
+}
+}
 CACLIENTTEST_FUNC_EXIT("CaServicePrivate::customSort");
 return (mErrorCode == NoErrorCode);
 }

changeset 93	82b66994846c
parent 92	782e3408c2ab
child 94	dbb8300717f7