[gnome-documents/gnome-3-10] Casefold strings instead of lowercaseing when searching

[Debarshi Ray <debarshir src gnome org>]

commit 880b73a9a47647b397b03a77805b9322153886f4
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Jan 15 10:50:28 2014 +0100

    Casefold strings instead of lowercaseing when searching
    
    Tracker's fn:lower-case calls u16_tolower or you_strToLower depending
    on whether its libunistring or libicu is being used, which may case
    Unicode strings to be "lowercased" differently than JavaScript's
    String.prototype.toLowerCase.
    
    In contrast tracker:case-fold calls g_utf8_casefold. Lets compare
    outputs from the same function for the sake of predictability.
    
    Moving the casefolding slightly lower down in the application has the
    pleasant side-effect of not messing up the search string in the UI.
    eg., if you enter "PASSAGE", preview a document, and come back to the
    overview, then the search string in the UI would not become "passage".
    
    https://bugzilla.gnome.org/show_bug.cgi?id=722246

 src/search.js              |    7 ++++---
 src/searchbar.js           |    2 +-
 src/shellSearchProvider.js |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/search.js b/src/search.js
index a122c8b..3c36dc4 100644
--- a/src/search.js
+++ b/src/search.js
@@ -63,7 +63,8 @@ const SearchController = new Lang.Class({
     },
 
     getTerms: function() {
-        let str = Tracker.sparql_escape_string(this._string);
+        let escaped_str = Tracker.sparql_escape_string(this._string);
+        let str = GLib.utf8_casefold(escaped_str, -1);
         return str.replace(/ +/g, ' ').split(' ');
     }
 });
@@ -232,11 +233,11 @@ const SearchMatch = new Lang.Class({
     getFilter: function() {
         if (this.id == SearchMatchStock.TITLE)
             return ('fn:contains ' +
-                    '(fn:lower-case (tracker:coalesce(nie:title(?urn), nfo:fileName(?urn))), ' +
+                    '(tracker:case-fold(tracker:coalesce(nie:title(?urn), nfo:fileName(?urn))), ' +
                     '"%s")').format(this._term);
         if (this.id == SearchMatchStock.AUTHOR)
             return ('fn:contains ' +
-                    '(fn:lower-case (tracker:coalesce(nco:fullname(?creator), nco:fullname(?publisher))), ' +
+                    '(tracker:case-fold(tracker:coalesce(nco:fullname(?creator), nco:fullname(?publisher))), 
' +
                     '"%s")').format(this._term);
         return '';
     }
diff --git a/src/searchbar.js b/src/searchbar.js
index 3439880..d8382c0 100644
--- a/src/searchbar.js
+++ b/src/searchbar.js
@@ -327,7 +327,7 @@ const OverviewSearchbar = new Lang.Class({
     },
 
     entryChanged: function() {
-        let currentText = this._searchEntry.get_text().toLowerCase();
+        let currentText = this._searchEntry.get_text();
 
         Application.searchController.disconnect(this._searchChangedId);
         Application.searchController.setString(currentText);
diff --git a/src/shellSearchProvider.js b/src/shellSearchProvider.js
index d61c43c..8847464 100644
--- a/src/shellSearchProvider.js
+++ b/src/shellSearchProvider.js
@@ -316,7 +316,7 @@ const FetchIdsJob = new Lang.Class({
     run: function(callback, cancellable) {
         this._callback = callback;
         this._cancellable = cancellable;
-        searchController.setString(this._terms.join(' ').toLowerCase());
+        searchController.setString(this._terms.join(' '));
 
         let query = queryBuilder.buildGlobalQuery();
         Application.connectionQueue.add(query.sparql, this._cancellable, Lang.bind(this,