tracker r2851 - in trunk: . src/libtracker-data src/tracker-extract

[mottela svn gnome org]

Author: mottela
Date: Wed Jan 28 10:45:10 2009
New Revision: 2851
URL: http://svn.gnome.org/viewvc/tracker?rev=2851&view=rev

Log:
Added missing sql escaping

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-data/tracker-rdf-query.c
   trunk/src/tracker-extract/Makefile.am

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Wed Jan 28 10:45:10 2009
@@ -725,11 +725,19 @@
 static gchar *
 get_value (const gchar *value, gboolean quote)
 {
+	gchar *escaped;
+	gchar *ret;
+
+	escaped = tracker_escape_string(value);
 	if (quote) {
-		return g_strconcat (" '", value, "' ", NULL);
+		ret = g_strconcat (" '", escaped, "' ", NULL);
 	} else {
-		return g_strdup (value);
+		ret = g_strdup (escaped);
 	}
+
+	g_free (escaped);
+
+	return ret;
 }
 
 static gboolean
@@ -1236,10 +1244,8 @@
 				value = g_strdup (keywords[keyword]);
 			}
 
-			g_debug ("Adding key: %s Value:%s", key, value);
-
 			list = g_hash_table_lookup (table, key);
-			list = g_list_prepend (list, g_strdup (value));
+			list = g_list_prepend (list, tracker_escape_string(value));
 			g_hash_table_insert (table, g_strdup (key), list);
 
 			g_free (full);

Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am	(original)
+++ trunk/src/tracker-extract/Makefile.am	Wed Jan 28 10:45:10 2009
@@ -64,6 +64,10 @@
 modules_LTLIBRARIES += libextract-gstreamer.la
 endif
 
+if HAVE_GSTREAMER
+modules_LTLIBRARIES += libextract-gstreamer-tagreadbin.la
+endif
+
 if HAVE_GST_HELIX
 modules_LTLIBRARIES += libextract-gstreamer-helix.la
 endif 
@@ -171,6 +175,11 @@
 libextract_gstreamer_la_LDFLAGS = $(module_flags) $(albumart_flags)
 libextract_gstreamer_la_LIBADD = $(albumart_libs) $(GSTREAMER_LIBS) $(GLIB2_LIBS)
 
+# GStreamer tagreadbin
+libextract_gstreamer_tagreadbin_la_SOURCES = tracker-extract-gstreamer-tagreadbin.c $(albumart_sources) $(escape_sources)
+libextract_gstreamer_tagreadbin_la_LDFLAGS = $(module_flags) $(albumart_flags)
+libextract_gstreamer_tagreadbin_la_LIBADD = $(albumart_libs) $(GSTREAMER_LIBS) $(GLIB2_LIBS)
+
 # GStreamer helix
 libextract_gstreamer_helix_la_SOURCES = tracker-extract-gstreamer-helix.c $(albumart_sources) $(escape_sources)
 libextract_gstreamer_helix_la_LDFLAGS = $(module_flags) $(albumart_flags)