FCL/sf/mw/qtextensions: comparison qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 if(contacts.isEmpty()) {
 QMap<int, QContactManager::Error> errors;
 errors[0] = QContactManager::BadArgumentError;
 QContactSaveRequest* saveRequest = qobject_cast<QContactSaveRequest*>(req);
-QContactManagerEngine::updateContactSaveRequest(saveRequest, contacts, QContactManager::BadArgumentError,
+QContactManagerEngine::updateContactSaveRequest(saveRequest, contacts, QContactManager::BadArgumentError, errors, r->state());
-errors);
 return;
 }
 QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::ActiveState);
+TrackerChangeListener *changeListener = new TrackerChangeListener(parent, this);
+connect(changeListener, SIGNAL(contactsChanged(const QList<QContactLocalId> &)),SLOT(onTrackerSignal(const QList<QContactLocalId> &)));
+connect(changeListener, SIGNAL(contactsAdded(const QList<QContactLocalId> &)),SLOT(onTrackerSignal(const QList<QContactLocalId> &)));
 // Save contacts with batch size
 /// @todo where to get reasonable batch size
 int batchSize = 100;
 for (int i = 0; i < contacts.size(); i+=batchSize) {
 return;
 }
 foreach (QContactLocalId id, addedIds) {
 pendingContactIds.remove(id);
+// since if was OK, remove entry for error
+errorsOfContactsFinished.remove(id2Index[id]);
 }
 if (pendingContactIds.count() == 0) {
 // compute master error - part of qtcontacts api
 QContactManager::Error error = QContactManager::NoError;
 {
 error = err;
 break;
 }
 }
-QContactManagerEngine::updateContactSaveRequest(r, contactsFinished, error, errorsOfContactsFinished);
-QContactManagerEngine::updateRequestState(req, QContactAbstractRequest::FinishedState);
+QContactManagerEngine::updateContactSaveRequest(r, contactsFinished, error, errorsOfContactsFinished, QContactAbstractRequest::FinishedState);
 }
 }
 void QTrackerContactSaveRequest::saveContacts(const QList<QContact> &contacts)
 {
 Q_ASSERT(engine);
 QSettings definitions(QSettings::IniFormat, QSettings::UserScope, "Nokia", "Trackerplugin");
 QTrackerContactsLive cLive;
 RDFServicePtr service = cLive.service();
-bool isModified = false;
 foreach(QContact contact, contacts) {
+/*
+Validation is disabled because it blocks saving contacts parsed from vcards
+TODO left the commented code while opaque (custom) details are under discussion as remainder
 QContactManager::Error error;
-// Ensure that the contact data is ok. This comes from QContactModelEngine
 if(!engine->validateContact(contact, error)) {
 contactsFinished << contact;
 errorsOfContactsFinished[errorCount++] =  error;
 computeProgress(QList<QContactLocalId>());
 continue;
 }
+*/
 Live<nco::PersonContact> ncoContact;
+bool newContact = false;
 if(contact.localId() == 0) {
 // Save new contact. compute ID
 bool ok;
 // what if both processes read in the same time and write at the same time, no increment
 id.setLocalId(m_lastUsedId);
 id.setManagerUri(engine->managerUri());
 contact.setId(id);
 ncoContact->setContactUID(QString::number(m_lastUsedId));
 ncoContact->setContentCreated(QDateTime::currentDateTime());
+newContact = true;
 }  else {
-isModified = true;
 ncoContact = service->liveNode(QUrl("contact:"+QString::number(contact.localId())));
 /// @note Following needed in case we save new contact with given localId
 ncoContact->setContactUID(QString::number(contact.localId()));
 ncoContact->setContentLastModified(QDateTime::currentDateTime());
 }
 // this is important when returning contacts to sync team
 RDFVariable rdfContact = RDFVariable::fromType<nco::PersonContact>();
 rdfContact.property<nco::contactUID>() = LiteralValue(QString::number(contact.localId()));
 addTag(service, rdfContact, "addressbook");
-saveContactDetails( service, ncoContact, contact);
+saveContactDetails( service, ncoContact, contact, newContact);
 // name & nickname - different way from other details
 cLive.setLiveContact(ncoContact);
 cLive.setQContact(contact);
 if( !contact.detail<QContactName>().isEmpty() || !contact.detail<QContactNickname>().isEmpty() ) {
 cLive.saveName();
 }
-// TODO add async signal handling of for transaction's commitFinished
 contactsFinished << contact;
-errorsOfContactsFinished[errorCount++] =  QContactManager::NoError; // TODO ask how to get error code from tracker
+id2Index[contact.localId()] = errorCount;
-}
+// we fill error here - once response come that everything is OK, remove entry for this contact
+errorsOfContactsFinished[errorCount++] =  QContactManager::BadArgumentError;
-TrackerChangeListener *changeListener = new TrackerChangeListener(this);
+}
-if (isModified) {
-connect(changeListener, SIGNAL(contactsChanged(const QList<QContactLocalId> &)),
-SLOT(onTrackerSignal(const QList<QContactLocalId> &)));
-} else {
-connect(changeListener, SIGNAL(contactsAdded(const QList<QContactLocalId> &)),
-SLOT(onTrackerSignal(const QList<QContactLocalId> &)));
-}
 // remember to commit the transaction, otherwise all changes will be rolled back.
 cLive.commit();
 }
 ncoContact->setHasAffiliation(ncoAffiliation);
 }
 void QTrackerContactSaveRequest::saveContactDetails( RDFServicePtr service,
 Live<nco::PersonContact>& ncoContact,
-const QContact& contact)
+const QContact& contact,
+bool newContact)
 {
 QStringList detailDefinitionsToSave = detailsDefinitionsInContact(contact);
 // all the rest might need to save to PersonContact and to Affiliation contact
 RDFVariable rdfPerson = RDFVariable::fromType<nco::PersonContact>();
 rdfPerson.property<nco::contactUID>() = LiteralValue(QString::number(contact.localId()));
-// Delete all existing phone numbers - office and home
+if(not newContact) {
-deletePhoneNumbers(service, rdfPerson);
+// Delete all existing phone numbers - office and home
+deletePhoneNumbers(service, rdfPerson);
+}
 foreach(QString definition, detailDefinitionsToSave)
 {
 QList<QContactDetail> details = contact.details(definition);
 Q_ASSERT(!details.isEmpty());
 rdfPerson1.property<nco::contactUID>() = LiteralValue(QString::number(contact.localId()));
 QList<QContactDetail> workDetails;
 QList<QContactDetail> homeDetails;
 foreach(const QContactDetail& det, details) {
+// details can be for both contexts, so check for both seperately
 if( det.contexts().contains(QContactDetail::ContextWork) ) {
 workDetails << det;
-} else {
+}
+if( det.contexts().contains(QContactDetail::ContextHome)) {
+homeDetails << det;
+}
+if( !det.contexts().contains(QContactDetail::ContextHome)
+&& !det.contexts().contains(QContactDetail::ContextWork)) {
 homeDetails << det;
 }
 }
 /* Save details */
 if(definition == QContactPhoneNumber::DefinitionName) {
 if (!homeDetails.isEmpty()) {
-savePhoneNumbers(service, rdfPerson, homeDetails);
+savePhoneNumbers(service, rdfPerson, homeDetails, newContact);
 }
 if( !workDetails.isEmpty()) {
-savePhoneNumbers(service, rdfAffiliation, workDetails);
+savePhoneNumbers(service, rdfAffiliation, workDetails, newContact);
 }
 }
 else if(definition == QContactEmailAddress::DefinitionName) {
 if (!homeDetails.isEmpty())
-saveEmails(service, rdfPerson, homeDetails);
+saveEmails(service, rdfPerson, homeDetails, newContact);
 if( !workDetails.isEmpty())
-saveEmails(service, rdfAffiliation, workDetails);
+saveEmails(service, rdfAffiliation, workDetails, newContact);
 }
 else if(definition == QContactAddress::DefinitionName) {
 if (!homeDetails.isEmpty())
-saveAddresses(service, rdfPerson, homeDetails);
+saveAddresses(service, rdfPerson, homeDetails, newContact);
 if( !workDetails.isEmpty())
-saveAddresses(service, rdfAffiliation, workDetails);
+saveAddresses(service, rdfAffiliation, workDetails, newContact);
 }
 else if(definition == QContactUrl::DefinitionName) {
 if (!homeDetails.isEmpty())
-saveUrls(service, rdfPerson, homeDetails);
+saveUrls(service, rdfPerson, homeDetails, newContact);
 if( !workDetails.isEmpty())
-saveUrls(service, rdfAffiliation, workDetails);
+saveUrls(service, rdfAffiliation, workDetails, newContact);
 }
 else {
 // TODO refactor (bug: editing photo doesn't work)
 foreach(const QContactDetail &det, details )
 {
 definition = det.definitionName();
 if(definition == QContactAvatar::DefinitionName) {
-QUrl avatar = det.value(QContactAvatar::FieldAvatar);
+QUrl avatar = det.value(QContactAvatar::FieldImageUrl);
 Live<nie::DataObject> fdo = service->liveNode( avatar );
 ncoContact->setPhoto(fdo);
 }
 if(definition == QContactBirthday::DefinitionName) {
 ncoContact->setBirthDate(QDateTime(det.variantValue(QContactBirthday::FieldBirthday).toDate(), QTime(), Qt::UTC));
 /*!
 * write all phone numbers on one query to tracker
 * TODO this is temporary code for creating new, saving contacts need to handle only what was
 * changed.
 */
-void QTrackerContactSaveRequest::savePhoneNumbers(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details )
+void QTrackerContactSaveRequest::savePhoneNumbers(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details, bool newContact )
 {
 RDFUpdate up;
 RDFVariable varForInsert = var.deepCopy();
 foreach(const QContactDetail& det, details)
 {
 " ]"), "");
 // Temporary, because affiliation is still used - to be refactored next week to use Live nodes
 // using RFC 3966 canonical URI form
 QUrl newPhone = QString("tel:%1").arg(value);
 Live<nco::PhoneNumber> ncoPhone = service->liveNode(newPhone);
+if(not newContact) {
+ncoPhone->remove();
+}
 QStringList subtypes = det.value<QStringList>(QContactPhoneNumber::FieldSubTypes);
 if( subtypes.contains(QContactPhoneNumber::SubTypeMobile))
 up.addInsertion(newPhone, rdf::type::iri(), nco::CellPhoneNumber::iri());
 else if( subtypes.contains(QContactPhoneNumber::SubTypeCar))
 up.addInsertion(newPhone, rdf::type::iri(), nco::CarPhoneNumber::iri());
 else if( subtypes.contains(QContactPhoneNumber::SubTypeBulletinBoardSystem))
 up.addInsertion(newPhone, rdf::type::iri(), nco::BbsNumber::iri());
-else if( subtypes.contains(QContactPhoneNumber::SubTypeFacsimile))
+else if( subtypes.contains(QContactPhoneNumber::SubTypeFax))
 up.addInsertion(newPhone, rdf::type::iri(), nco::FaxNumber::iri());
 else if( subtypes.contains(QContactPhoneNumber::SubTypeModem))
 up.addInsertion(newPhone, rdf::type::iri(), nco::ModemNumber::iri());
 else if( subtypes.contains(QContactPhoneNumber::SubTypePager))
 up.addInsertion(newPhone, rdf::type::iri(), nco::PagerNumber::iri());
 /*!
 * write all phone numbers on one query to tracker
 * TODO this is temporary code for creating new, saving contacts need to handle only what was
 * changed.
 */
-void QTrackerContactSaveRequest::saveEmails(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details )
+void QTrackerContactSaveRequest::saveEmails(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details, bool newContact )
 {
 RDFUpdate up;
 RDFVariable varForInsert = var.deepCopy();
 RDFVariable emails = var.property<nco::hasEmailAddress>();
-// delete previous references - keep email IRIs
+if(not newContact) {
-up.addDeletion(RDFVariableStatement(var, nco::hasEmailAddress::iri(), emails));
+// delete previous references - keep email IRIs
+up.addDeletion(RDFVariableStatement(var, nco::hasEmailAddress::iri(), emails));
+}
 foreach(const QContactDetail& det, details)
 {
 QString value = det.value(QContactEmailAddress::FieldEmailAddress);
 // Temporary, because affiliation is still used - to be refactored next week to use only Live nodes
 /*!
 * write all Urls
 * TODO this is temporary code for creating new, saving contacts need to handle only what was
 * changed.
 */
-void QTrackerContactSaveRequest::saveUrls(RDFServicePtr service, RDFVariable &rdfContact, const QList<QContactDetail> &details )
+void QTrackerContactSaveRequest::saveUrls(RDFServicePtr service, RDFVariable &rdfContact, const QList<QContactDetail> &details, bool newContact )
 {
 RDFUpdate up;
 RDFVariable varForInsert = rdfContact.deepCopy();
 RDFVariable urls = rdfContact.property<nco::url>();
 RDFVariable urltypes = urls.property<rdf::type>();
 RDFVariable websiteUrls = rdfContact.property<nco::websiteUrl>();
 RDFVariable websiteUrlTypes = websiteUrls.property<rdf::type>();
-up.addDeletion(RDFVariableStatement(rdfContact, nco::url::iri(), urls));
+if(not newContact) {
-up.addDeletion(RDFVariableStatement(rdfContact, nco::websiteUrl::iri(), websiteUrls));
+// first part - deleting previous before adding new again is to be removed
-// first part - deleting previous before adding new again is to be removed
+up.addDeletion(RDFVariableStatement(rdfContact, nco::url::iri(), urls));
+up.addDeletion(RDFVariableStatement(rdfContact, nco::websiteUrl::iri(), websiteUrls));
+}
 // second part, write all urls
 foreach(const QContactDetail& det, details)
 {
 QUrl newUrl(det.value(QContactUrl::FieldUrl));//::tracker()->createLiveNode().uri();
 /*!
 * write all phone numbers on one query to tracker
 * TODO this is temporary code for creating new, saving contacts need to handle only what was
 * changed.
 */
-void QTrackerContactSaveRequest::saveAddresses(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details )
+void QTrackerContactSaveRequest::saveAddresses(RDFServicePtr service, RDFVariable &var, const QList<QContactDetail> &details, bool newContact )
 {
 RDFUpdate up;
 RDFVariable varForInsert = var.deepCopy();
 RDFVariable addresses = var.property<nco::hasPostalAddress>();
 RDFVariable types = addresses.property<rdf::type>();
-up.addDeletion(RDFVariableStatement(var, nco::hasPostalAddress::iri(), addresses));
+if(not newContact) {
-up.addDeletion(addresses, rdf::type::iri(), types);
+up.addDeletion(RDFVariableStatement(var, nco::hasPostalAddress::iri(), addresses));
+up.addDeletion(addresses, rdf::type::iri(), types);
+}
 foreach(const QContactDetail& det, details)
 {
 QUrl newPostalAddress = ::tracker()->createLiveNode().uri();
 // TODO     nco:DomesticDeliveryAddress, nco:InternationalDeliveryAddress, nco:ParcelDeliveryAddress
 up.addInsertion(newPostalAddress, rdf::type::iri(), nco::PostalAddress::iri());

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 11	06b8e2af4411