tracker r1222 - in trunk: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Mar 10 15:14:48 2008
New Revision: 1222
URL: http://svn.gnome.org/viewvc/tracker?rev=1222&view=rev

Log:
	* src/trackerd/tracker-indexer.c: Fix missing
	libtracker-common/tracker-config.h dependency and clean up
	function which requires it.


Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-indexer.c

Modified: trunk/src/trackerd/tracker-indexer.c
==============================================================================
--- trunk/src/trackerd/tracker-indexer.c	(original)
+++ trunk/src/trackerd/tracker-indexer.c	Mon Mar 10 15:14:48 2008
@@ -35,6 +35,7 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-config.h>
 
 #include "tracker-indexer.h"
 #include "tracker-cache.h"
@@ -168,22 +169,18 @@
 static int
 get_preferred_bucket_count (Indexer *indexer)
 {
-	int result;
+	gint result;
         gint bucket_ratio;
 
         bucket_ratio = tracker_config_get_bucket_ratio (tracker->config);
+        result = dprnum (indexer->word_index);
 
 	if (bucket_ratio < 1) {
-
-		result = (dprnum (indexer->word_index)/2);
-
+		result /= 2;
 	} else if (bucket_ratio > 3) {
-
-		result = (dprnum (indexer->word_index) * 4);
-
+		result *= 4;
 	} else {
-
-		result = (bucket_ratio * dprnum (indexer->word_index));
+		result *= bucket_ratio;
 	}
 
 	tracker_log ("Preferred bucket count is %d", result);
@@ -191,7 +188,6 @@
 	return  result;
 }
 
-
 gboolean
 tracker_indexer_repair (const char *name)
 {