tracker: Correct RDF query in 'search'

"File:Path" means path to the directory containing the file rather than
path of the file itself. Full points goes to Mr. Jamie McCracken for
coming-up with this.

diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index d4c9f8a..e5a2831 100644 (file)
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -214,13 +214,24 @@ public class Rygel.TrackerSearchContainer : Rygel.MediaContainer {
                                                out parent_id,
                                                out service);
                 if (path != null) {
+                    var dir = Path.get_dirname (path);
+                    var basename = Path.get_basename (path);
+
                     var search_condition =
-                                        "<rdfq:equals>\n" +
-                                            "<rdfq:Property " +
-                                                "name=\"File:Path\" />\n" +
-                                            "<rdf:String>" + path +
-                                            "</rdf:String>\n" +
-                                         "</rdfq:equals>\n";
+                                        "<rdfq:and>\n" +
+                                            "<rdfq:equals>\n" +
+                                                "<rdfq:Property " +
+                                                    "name=\"File:Path\" />\n" +
+                                                    "<rdf:String>" + dir +
+                                                    "</rdf:String>\n" +
+                                            "</rdfq:equals>\n" +
+                                            "<rdfq:equals>\n" +
+                                                "<rdfq:Property " +
+                                                    "name=\"File:Name\" />\n" +
+                                                    "<rdf:String>" + basename +
+                                                    "</rdf:String>\n" +
+                                            "</rdfq:equals>\n" +
+                                        "</rdfq:and>\n";
 
                     if (this.query_condition != "") {
                         query = "<rdfq:Condition>\n" +