tracker r2231 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer

[mr svn gnome org]

Author: mr
Date: Mon Sep 15 13:12:43 2008
New Revision: 2231
URL: http://svn.gnome.org/viewvc/tracker?rev=2231&view=rev

Log:
	* src/libtracker-common/tracker-file-utils.c:
	(tracker_env_check_xdg_dirs): Don't warn when the XDG_DATA_HOME
	environment variable is empty (and NULL).

	* src/libtracker-common/tracker-ontology.c:
	(tracker_ontology_service_add): Don't add service names and field
	names in to the hash table collated, they can be looked up then.

	* src/tracker-indexer/tracker-metadata-utils.c: Re-enable
	thumbnail extraction now we know it isn't slowing us down in the
	indexer.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/tracker-file-utils.c
   branches/indexer-split/src/libtracker-common/tracker-ontology.c
   branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c

Modified: branches/indexer-split/src/libtracker-common/tracker-file-utils.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-file-utils.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-file-utils.c	Mon Sep 15 13:12:43 2008
@@ -801,7 +801,7 @@
 	/* Check the default XDG_DATA_HOME location */
         g_message ("  XDG_DATA_HOME is '%s'", user_data_dir);
 
-	if (path_has_write_access_or_was_created (user_data_dir)) {
+	if (user_data_dir && path_has_write_access_or_was_created (user_data_dir)) {
 		return TRUE;
 	}
 

Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.c	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c	Mon Sep 15 13:12:43 2008
@@ -74,7 +74,6 @@
  * 
  * If this breaks things, we can reinstate it.
  */
-
 static gpointer
 ontology_hash_lookup_by_collated_str (GHashTable  *hash_table, 
 				      const gchar *str)
@@ -199,7 +198,8 @@
 	name = tracker_service_get_name (service);
 
 	g_hash_table_insert (service_names, 
-			     g_utf8_collate_key (name, -1), 
+			     /* g_utf8_collate_key (name, -1),  */
+			     g_strdup (name),
 			     g_object_ref (service));
 	g_hash_table_insert (service_ids, 
 			     g_strdup_printf ("%d", id), 
@@ -594,11 +594,16 @@
 void
 tracker_ontology_field_add (TrackerField *field)
 {
+	const gchar *name;
+
 	g_return_if_fail (TRACKER_IS_FIELD (field));
-	g_return_if_fail (tracker_field_get_name (field) != NULL);
 	
+	name = tracker_field_get_name (field);
+	g_return_if_fail (name != NULL);
+
 	g_hash_table_insert (field_names, 
-			     g_utf8_collate_key (tracker_field_get_name (field), -1),
+			     /* g_utf8_collate_key (tracker_field_get_name (field), -1), */
+			     g_strdup (name),
 			     g_object_ref (field));
 }
 

Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c	Mon Sep 15 13:12:43 2008
@@ -32,10 +32,7 @@
 #include <libtracker-common/tracker-os-dependant.h>
 #include <libtracker-common/tracker-ontology.h>
 
-/* This is temporarily disabled until hildon-thumbnailer is enabled.
- * There are performance concerns with this enabled.
- */
-#undef THUMBNAIL_RETRIEVAL_ENABLED
+#define THUMBNAIL_RETRIEVAL_ENABLED
 
 #ifdef HAVE_HILDON_THUMBNAIL
 #include <hildon-thumbnail-factory.h>