[rygel] core,tracker: Drop support for search by 'res'



commit faba9fa346f89f144d7db059eef5d6471d4798ca
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Aug 20 19:10:25 2010 +0300

    core,tracker: Drop support for search by 'res'
    
    Drop support for search by 'res' and 'res protocolInfo'. Since we didn't
    handle proxy and transcoding resources this gave wrong impression to the
    clients and was causing rygel to fail DLNA CTT test case 7.3.66.3,4.

 .../tracker/rygel-tracker-search-container.vala    |    3 --
 src/rygel/rygel-relational-expression.vala         |   24 +------------------
 2 files changed, 2 insertions(+), 25 deletions(-)
---
diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index 15a6547..744b626 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -242,9 +242,6 @@ public class Rygel.Tracker.SearchContainer : Rygel.MediaContainer {
                     value = expression.operand2;
                     break;
             }
-        } else if (expression.operand1 == "res") {
-            variable = URL_VARIABLE;
-            value = "\"" + expression.operand2 + "\"";
         }
 
         if (variable == null || value == null) {
diff --git a/src/rygel/rygel-relational-expression.vala b/src/rygel/rygel-relational-expression.vala
index 2e76f77..f1a00c2 100644
--- a/src/rygel/rygel-relational-expression.vala
+++ b/src/rygel/rygel-relational-expression.vala
@@ -27,8 +27,7 @@ using GUPnP;
 public class Rygel.RelationalExpression :
              Rygel.SearchExpression<SearchCriteriaOp,string,string> {
     internal const string CAPS = "@id,@parentID,upnp:class," +
-                                 "dc:title,dc:creator,upnp:createClass," +
-                                 "res,res protocolInfo";
+                                 "dc:title,dc:creator,upnp:createClass";
 
     public override bool satisfied_by (MediaObject media_object) {
         switch (this.operand1) {
@@ -55,11 +54,7 @@ public class Rygel.RelationalExpression :
             var item = media_object as MediaItem;
             return this.compare_string (item.author);
         default:
-            if (this.operand1.has_prefix ("res")) {
-                return this.compare_resource (media_object);
-            } else {
-                return false;
-            }
+            return false;
         }
     }
 
@@ -81,21 +76,6 @@ public class Rygel.RelationalExpression :
         return ret;
     }
 
-    private bool compare_resource (MediaObject media_object) {
-        bool ret = false;
-
-        foreach (var uri in media_object.uris) {
-            if (this.operand1 == "res" && this.compare_string (uri)) {
-                ret = true;
-                break;
-            } else if (this.operand1 == "res protocolInfo") {
-                // FIXME: Implement
-            }
-        }
-
-        return ret;
-    }
-
     public bool compare_string (string? str) {
         switch (this.op) {
         case SearchCriteriaOp.EXISTS:



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