tracker r2093 - in branches/indexer-split: . src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Mon Aug 18 16:00:53 2008
New Revision: 2093
URL: http://svn.gnome.org/viewvc/tracker?rev=2093&view=rev

Log:
2008-08-18  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-indexer-module.c
        (tracker_indexer_module_file_get_uri): Set dirname/basename to NULL if
        the function is going to return FALSE.
        * src/tracker-indexer/tracker-indexer.c (create_update_item): Check
        that the module could get the URI for the element being processed.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-module.c	Mon Aug 18 16:00:53 2008
@@ -149,9 +149,19 @@
 
 		return TRUE;
 	} else {
+		g_warning ("Could not get URI for '%s'", file->path);
+
 		g_free (tmp_dirname);
 		g_free (tmp_basename);
 
+		if (dirname) {
+			*dirname = NULL;
+		}
+
+		if (basename) {
+			*basename = NULL;
+		}
+
 		return FALSE;
 	}
 }

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Mon Aug 18 16:00:53 2008
@@ -1064,10 +1064,13 @@
 		return;
 	}
 
-	tracker_indexer_module_file_get_uri (info->module, 
-					     info->file, 
-					     &dirname, 
-					     &basename);
+	if (!tracker_indexer_module_file_get_uri (info->module,
+						  info->file,
+						  &dirname,
+						  &basename)) {
+		return;
+	}
+
 	id = tracker_db_check_service (service_def, 
 				       dirname, 
 				       basename);