Merge lp:~renatofilho/address-book-service/fix-1367906 into lp:address-book-service

[Renato Araujo Oliveira Filho]

Added a new field on contact object "X-NORMALIZED_FN" which contains the unaccented contact full name.

This field will be used on search.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/address-book-service-ci/322/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-service-vivid-i386-ci/6
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/572
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/319/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/491
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/570
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16580
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/267/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/325
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/325/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-service-ci/322/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

review: Approve

=== modified file 'lib/qindividual.cpp'
--- lib/qindividual.cpp	2014-11-06 15:44:15 +0000
+++ lib/qindividual.cpp	2014-12-15 19:47:37 +0000
@@ -116,6 +116,22 @@
     } \
 }
 
+static QString unaccent(const QString &value)
+{
+    QString s2 = value.normalized(QString::NormalizationForm_D);
+    QString out;
+
+    for (int i=0, j=s2.length(); i<j; i++)
+    {
+        // strip diacritic marks
+        if (s2.at(i).category() != QChar::Mark_NonSpacing &&
+            s2.at(i).category() != QChar::Mark_SpacingCombining) {
+            out.append(s2.at(i));
+        }
+    }
+    return out;
+}
+
 }
 
 namespace galera
@@ -906,6 +922,11 @@
         tag.setTag(label);
     }
     contact->saveDetail(&tag);
+
+    QContactExtendedDetail normalizedLabel;
+    normalizedLabel.setName("X-NORMALIZED_FN");
+    normalizedLabel.setData(unaccent(dLabel.label()));
+    contact->saveDetail(&normalizedLabel);
 }
 
 bool QIndividual::update(const QtContacts::QContact &newContact, QObject *object, const char *slot)