diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2021-02-28 19:56:42 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2021-03-01 18:59:08 +0100 |
| commit | b4cdb29f7a07fa73d03c5fb73319547058667225 (patch) | |
| tree | acb74a0f68ea92a8fb4aa12580a657a223f218f6 | |
| parent | 3f24096396aadca64651f203e6c1f84b99b4916b (diff) | |
| download | tracker-b4cdb29f7a07fa73d03c5fb73319547058667225.tar.gz | |
libtracker-data: Handle nesting of multivalued property functions
Do not convert results to string except in the topmost property function,
so things like nmm:artistName(nmm:performer(?u)) work. This allows arbitrary
nesting of single and multivalued properties to work consistently.
Fixes: https://gitlab.gnome.org/GNOME/tracker/-/issues/259
| -rw-r--r-- | src/libtracker-data/tracker-sparql.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c index 10e04bfd1..c4aaaaaa9 100644 --- a/src/libtracker-data/tracker-sparql.c +++ b/src/libtracker-data/tracker-sparql.c @@ -150,6 +150,7 @@ typedef struct gint fts_match_idx; gboolean convert_to_string; + gboolean in_property_function; } TrackerSparqlState; struct _TrackerSparql @@ -7595,8 +7596,13 @@ handle_property_function (TrackerSparql *sparql, GError **error) { TrackerPropertyType type; + gboolean in_property_function; - if (tracker_property_get_multiple_values (property)) { + in_property_function = sparql->current_state->in_property_function; + sparql->current_state->in_property_function = TRUE; + + if (!in_property_function && + tracker_property_get_multiple_values (property)) { TrackerStringBuilder *str, *old; _append_string (sparql, "(SELECT GROUP_CONCAT ("); @@ -7638,12 +7644,13 @@ handle_property_function (TrackerSparql *sparql, } } - _append_string (sparql, "WHERE ID = "); + _append_string (sparql, "WHERE ID IN ("); _call_rule (sparql, NAMED_RULE_ArgList, error); - _append_string_printf (sparql, "AND \"%s\" IS NOT NULL", + _append_string_printf (sparql, ") AND \"%s\" IS NOT NULL", tracker_property_get_name (property)); _append_string (sparql, ") "); + sparql->current_state->in_property_function = in_property_function; sparql->current_state->expression_type = type; return TRUE; |