[rygel] tracker: Improved handling of search by "upnp:class"



commit 84e89df856d43dc69e0fc53e50184ea233cb3677
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Sep 28 16:37:40 2010 +0300

    tracker: Improved handling of search by "upnp:class"
    
    SearchContainer maps search for "upnp:class" to all its children if
    "upnp:class" in question is that of its item factory.

 .../tracker/rygel-tracker-search-container.vala    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index ef71a4e..c94de34 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -198,7 +198,7 @@ public class Rygel.Tracker.SearchContainer : Rygel.MediaContainer {
                                           int                   offset,
                                           int                   max_count) {
         if (expression.operand1 == "upnp:class" &&
-            expression.operand2.has_prefix (MediaContainer.UPNP_CLASS)) {
+            !this.item_factory.upnp_class.has_prefix (expression.operand2)) {
             return null;
         }
 
@@ -208,7 +208,7 @@ public class Rygel.Tracker.SearchContainer : Rygel.MediaContainer {
             if (!expression.compare_string (this.id)) {
                 return null;
             }
-        } else {
+        } else if (expression.operand1 != "upnp:class") {
             var filter = create_filter_for_child (expression);
             if (filter != null) {
                 query.filters.insert (0, filter);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]