tracker r3035 - in trunk: . src/libtracker-db src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Mon Mar  9 13:39:53 2009
New Revision: 3035
URL: http://svn.gnome.org/viewvc/tracker?rev=3035&view=rev

Log:
2009-03-09  Carlos Garnacho  <carlos imendio com>

        * src/libtracker-db/tracker-db-index-item.c
        (tracker_db_index_item_calc_amalgamated): Also clamp big negative
        values to fit into a gint16, so we don't possibly underflow.
        * src/tracker-indexer/tracker-indexer.c (item_erase): Schedule a flush
        after an item has been removed.

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-db/tracker-db-index-item.c
   trunk/src/tracker-indexer/tracker-indexer.c

Modified: trunk/src/libtracker-db/tracker-db-index-item.c
==============================================================================
--- trunk/src/libtracker-db/tracker-db-index-item.c	(original)
+++ trunk/src/libtracker-db/tracker-db-index-item.c	Mon Mar  9 13:39:53 2009
@@ -28,11 +28,8 @@
 	gint16	      score16;
 	guint8	      service_type_8;
 
-	if (score > 30000) {
-		score16 = 30000;
-	} else {
-		score16 = (gint16) score;
-	}
+	score = CLAMP (score, G_MININT16, G_MAXINT16);
+	score16 = (gint16) score;
 
 	service_type_8 = (guint8) service_type;
 

Modified: trunk/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-indexer.c	(original)
+++ trunk/src/tracker-indexer/tracker-indexer.c	Mon Mar  9 13:39:53 2009
@@ -1798,6 +1798,8 @@
 	/* Delete service */
 	tracker_data_update_delete_all_metadata (service, service_id);
 	tracker_data_update_delete_service (service, service_id);
+
+	schedule_flush (indexer, FALSE);
 }
 
 static void