[tracker/wip/carlosg/json-ld-serialization: 165/165] libtracker-sparql: Deprecate tracker_resource_print_jsonld()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/json-ld-serialization: 165/165] libtracker-sparql: Deprecate tracker_resource_print_jsonld()
- Date: Mon, 17 Oct 2022 21:50:23 +0000 (UTC)
commit ab670ca02a3c803458894a3c7fd15f4b0953e408
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Jul 11 20:40:03 2022 +0200
libtracker-sparql: Deprecate tracker_resource_print_jsonld()
And reimplement it using tracker_resource_print_rdf() and
TRACKER_RDF_FORMAT_JSON_LD.
src/libtracker-sparql/tracker-resource.c | 148 +------------------------------
src/libtracker-sparql/tracker-resource.h | 2 +-
2 files changed, 3 insertions(+), 147 deletions(-)
---
diff --git a/src/libtracker-sparql/tracker-resource.c b/src/libtracker-sparql/tracker-resource.c
index 2b098d890..097ead943 100644
--- a/src/libtracker-sparql/tracker-resource.c
+++ b/src/libtracker-sparql/tracker-resource.c
@@ -1499,116 +1499,6 @@ tracker_resource_print_sparql_update (TrackerResource *resource,
return g_string_free (context.string, FALSE);
}
-typedef struct {
- TrackerNamespaceManager *all_namespaces, *our_namespaces;
- JsonBuilder *builder;
- GList *done_list;
-} GenerateJsonldData;
-
-static void generate_jsonld_foreach (gpointer key, gpointer value_ptr, gpointer user_data);
-
-static void
-tracker_resource_generate_jsonld (TrackerResource *self,
- GenerateJsonldData *data)
-{
- TrackerResourcePrivate *priv = GET_PRIVATE (self);
- JsonBuilder *builder = data->builder;
-
- /* The JSON-LD spec says it is "important that nodes have an identifier", but
- * doesn't mandate one. I think it's better to omit the ID for blank nodes
- * (where the caller passed NULL as an identifier) than to emit something
- * SPARQL-specific like '_:123'.
- */
- if (!tracker_resource_is_blank_node (self)) {
- json_builder_set_member_name (builder, "@id");
- json_builder_add_string_value (builder, priv->identifier);
- }
-
- g_hash_table_foreach (priv->properties, generate_jsonld_foreach, data);
-}
-
-static void
-generate_jsonld_value (const GValue *value,
- GenerateJsonldData *data)
-{
- JsonNode *node;
-
- if (G_VALUE_HOLDS (value, TRACKER_TYPE_RESOURCE)) {
- TrackerResource *resource;
-
- resource = TRACKER_RESOURCE (g_value_get_object (value));
-
- if (g_list_find (data->done_list, resource) == NULL) {
- data->done_list = g_list_prepend (data->done_list, resource);
- json_builder_begin_object (data->builder);
-
- tracker_resource_generate_jsonld (resource, data);
-
- json_builder_end_object (data->builder);
- } else {
- json_builder_add_string_value (data->builder,
tracker_resource_get_identifier(resource));
- }
- } else if (G_VALUE_HOLDS (value, TRACKER_TYPE_URI)) {
- /* URIs can be treated the same as strings in JSON-LD provided the @context
- * sets the type of that property correctly. However, json_node_set_value()
- * will reject a GValue holding TRACKER_TYPE_URI, so we have to extract the
- * string manually here.
- */
- const char *uri = g_value_get_string (value);
- maybe_intern_prefix_of_compact_uri (data->all_namespaces, data->our_namespaces, uri);
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_string (node, uri);
- json_builder_add_value (data->builder, node);
- } else if (G_VALUE_HOLDS (value, G_TYPE_UINT)) {
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_int (node, g_value_get_uint(value));
- json_builder_add_value (data->builder, node);
- } else {
- node = json_node_new (JSON_NODE_VALUE);
- json_node_set_value (node, value);
- json_builder_add_value (data->builder, node);
- }
-}
-
-static void
-generate_jsonld_foreach (gpointer key,
- gpointer value_ptr,
- gpointer user_data)
-{
- const char *property = key;
- const GValue *value = value_ptr;
- GenerateJsonldData *data = user_data;
- JsonBuilder *builder = data->builder;
-
- if (strcmp (property, "rdf:type") == 0) {
- property = "@type";
- } else {
- maybe_intern_prefix_of_compact_uri (data->all_namespaces, data->our_namespaces, property);
- }
-
- json_builder_set_member_name (builder, property);
-
- if (G_VALUE_HOLDS (value, G_TYPE_PTR_ARRAY)) {
- json_builder_begin_array (builder);
- g_ptr_array_foreach (g_value_get_boxed (value), (GFunc) generate_jsonld_value, data);
- json_builder_end_array (builder);
- } else {
- generate_jsonld_value (value, data);
- }
-}
-
-static void
-generate_jsonld_namespace_mapping_foreach (gpointer key,
- gpointer value,
- gpointer user_data)
-{
- GenerateJsonldData *data = user_data;
-
- json_builder_set_member_name (data->builder, key);
- json_builder_add_string_value (data->builder, value);
-}
-
-
/**
* tracker_resource_print_jsonld:
* @self: a #TrackerResource
@@ -1630,10 +1520,7 @@ char *
tracker_resource_print_jsonld (TrackerResource *self,
TrackerNamespaceManager *namespaces)
{
- GenerateJsonldData context;
- JsonNode *json_root_node;
- JsonGenerator *generator;
- char *result;
+ g_return_val_if_fail (TRACKER_IS_RESOURCE (self), "");
if (namespaces == NULL) {
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -1641,38 +1528,7 @@ tracker_resource_print_jsonld (TrackerResource *self,
G_GNUC_END_IGNORE_DEPRECATIONS
}
- context.all_namespaces = namespaces;
- context.our_namespaces = tracker_namespace_manager_new ();
- context.builder = json_builder_new ();
- context.done_list = g_list_prepend (NULL, self);
-
- maybe_intern_prefix_of_compact_uri (context.all_namespaces, context.our_namespaces,
tracker_resource_get_identifier (self));
-
- json_builder_begin_object (context.builder);
-
- tracker_resource_generate_jsonld (self, &context);
-
- json_builder_set_member_name (context.builder, "@context");
- json_builder_begin_object (context.builder);
- tracker_namespace_manager_foreach (context.our_namespaces, generate_jsonld_namespace_mapping_foreach,
&context);
- json_builder_end_object (context.builder);
-
- json_builder_end_object (context.builder);
-
- json_root_node = json_builder_get_root (context.builder);
-
- generator = json_generator_new ();
- json_generator_set_root (generator, json_root_node);
- json_generator_set_pretty (generator, TRUE);
-
- result = json_generator_to_data (generator, NULL);
-
- g_list_free (context.done_list);
- json_node_free (json_root_node);
- g_object_unref (context.builder);
- g_object_unref (generator);
-
- return result;
+ return tracker_resource_print_rdf (self, namespaces, TRACKER_RDF_FORMAT_JSON_LD, NULL);
}
static TrackerSerializerFormat
diff --git a/src/libtracker-sparql/tracker-resource.h b/src/libtracker-sparql/tracker-resource.h
index 710a8fed0..4e6cccf60 100644
--- a/src/libtracker-sparql/tracker-resource.h
+++ b/src/libtracker-sparql/tracker-resource.h
@@ -112,7 +112,7 @@ char *tracker_resource_print_turtle(TrackerResource *self, TrackerNamespaceManag
TRACKER_AVAILABLE_IN_ALL
char *tracker_resource_print_sparql_update (TrackerResource *self, TrackerNamespaceManager *namespaces,
const char *graph_id);
-TRACKER_AVAILABLE_IN_ALL
+TRACKER_DEPRECATED_IN_3_4_FOR(tracker_resource_print_rdf)
char *tracker_resource_print_jsonld (TrackerResource *self, TrackerNamespaceManager *namespaces);
TRACKER_AVAILABLE_IN_3_4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]