[gnome-documents] query: cleanups

[Cosimo Cecchi <cosimoc src gnome org>]

commit ab33fa13a9a4a68a2f5769d381e5ba3fa38a6aa9
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Oct 14 17:07:07 2011 -0400

    query: cleanups

 src/query.js   |   12 ++++++------
 src/sources.js |    3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/query.js b/src/query.js
index 0e813f6..3e688df 100644
--- a/src/query.js
+++ b/src/query.js
@@ -74,7 +74,7 @@ QueryBuilder.prototype = {
         let filter =
             ('((fn:starts-with (nie:url(?urn), "%s")) || ' +
              ' (fn:starts-with (nie:url(?urn), "%s")) || ' +
-             ' (fn:starts-with (nie:url(?urn), "%s"))    )').format(desktopURI, documentsURI, downloadsURI);
+             ' (fn:starts-with (nie:url(?urn), "%s")))').format(desktopURI, documentsURI, downloadsURI);
 
         return filter;
     },
@@ -96,12 +96,12 @@ QueryBuilder.prototype = {
 
     _buildFilterSearch: function() {
         let filter =
-            ('fn:contains ' +
+            ('(fn:contains ' +
              '(fn:lower-case (tracker:coalesce(nie:title(?urn), nfo:fileName(?urn))), ' +
              '"%s") ||' +
              'fn:contains ' +
              '(fn:lower-case (tracker:coalesce(nco:fullname(?creator), nco:fullname(?publisher))), ' +
-             '"%s")').format(Global.searchFilterController.getFilter(),
+             '"%s"))').format(Global.searchFilterController.getFilter(),
                              Global.searchFilterController.getFilter());
 
         return filter;
@@ -121,11 +121,11 @@ QueryBuilder.prototype = {
 
         sparql += '(' + this._buildFilterSearch() + ')';
         sparql += ' && ';
-        sparql += '(' + Global.sourceManager.getActiveSourceFilter() + ')';
+        sparql += Global.sourceManager.getActiveSourceFilter();
         sparql += ' && ';
-        sparql += '(' + Global.categoryManager.getActiveCategoryFilter() + ')';
+        sparql += Global.categoryManager.getActiveCategoryFilter();
         sparql += ' && ';
-        sparql += '(' + this._buildFilterType() + ')';
+        sparql += this._buildFilterType();
 
         sparql += ')';
 
diff --git a/src/sources.js b/src/sources.js
index 04baf2a..4f04ab3 100644
--- a/src/sources.js
+++ b/src/sources.js
@@ -62,7 +62,8 @@ Source.prototype = {
             return Global.queryBuilder.buildFilterLocal();
 
         if (this.id == 'all')
-            return Global.queryBuilder.buildFilterLocal() + ' || ' + Global.queryBuilder.buildFilterNotLocal();
+            return '(' + Global.queryBuilder.buildFilterLocal() + ' || '
+                    + Global.queryBuilder.buildFilterNotLocal() + ')';
 
         return this._buildFilterResource();
     },