Index: ChangeLog =================================================================== --- ChangeLog (revision 480) +++ ChangeLog (working copy) @@ -1,3 +1,9 @@ +2007-02-13 Tshepang Lekhonkhobe + + * tracker.cfg: replaced the unused EnableDebugLogging entry with Verbosity + * remove unnecessary checks for tracker->verbosity + * some spelling corrections and other minor changes + 2007-02-12 Patch from Gergan Penkov * Added missing function prototype Index: src/trackerd/tracker-email-utils.c =================================================================== --- src/trackerd/tracker-email-utils.c (revision 480) +++ src/trackerd/tracker-email-utils.c (working copy) @@ -143,10 +143,8 @@ tracker->index_count++; - if (tracker->verbosity == 0) { - if ( (tracker->index_count == 100 || (tracker->index_count >= 500 && tracker->index_count%500 == 0)) && (tracker->verbosity == 0)) { - tracker_log ("indexing #%d - Emails in %s", tracker->index_count, path); - } + if ( (tracker->index_count == 100 || (tracker->index_count >= 500 && tracker->index_count%500 == 0)) && (tracker->verbosity == 0)) { + tracker_info ("indexing #%d - Emails in %s", tracker->index_count, path); } tracker_check_flush (); Index: src/trackerd/trackerd.c =================================================================== --- src/trackerd/trackerd.c (revision 480) +++ src/trackerd/trackerd.c (working copy) @@ -1850,22 +1850,24 @@ char *bools[] = {"no", "yes"}; - tracker_log ("\nTracker configuration options :"); - tracker_log ("Low memory mode : \t\t\t%s", bools[!tracker->use_extra_memory]); - tracker_log ("Indexing enabled : \t\t\t%s", bools[tracker->enable_indexing]); - tracker_log ("Watching enabled : \t\t\t%s", bools[tracker->enable_watching]); - tracker_log ("File content indexing enabled : \t%s", bools[tracker->enable_content_indexing]); - tracker_log ("Thumbnailing enabled : \t\t\t%s", bools[tracker->enable_thumbnails]); - tracker_log ("Evolution email indexing enabled : \t%s", bools[tracker->index_evolution_emails]); - tracker_log ("Thunderbird email indexing enabled : \t%s", bools[tracker->index_thunderbird_emails]); - tracker_log ("K-Mail indexing enabled : \t\t%s\n", bools[tracker->index_kmail_emails]); + tracker_log ("Tracker configuration options :"); + tracker_log ("Verbosity : ........................ %d", tracker->verbosity); + tracker_log ("Low memory mode : .................. %s", bools[!tracker->use_extra_memory]); + tracker_log ("Indexing enabled : ................. %s", bools[tracker->enable_indexing]); + tracker_log ("Watching enabled : ................. %s", bools[tracker->enable_watching]); + tracker_log ("File content indexing enabled : .... %s", bools[tracker->enable_content_indexing]); + tracker_log ("Thumbnailing enabled : ............. %s", bools[tracker->enable_thumbnails]); + tracker_log ("Thumbnailing enabled : ............. %s", bools[tracker->enable_thumbnails]); + tracker_log ("Evolution email indexing enabled : . %s", bools[tracker->index_evolution_emails]); + tracker_log ("Thunderbird email indexing enabled : %s", bools[tracker->index_thunderbird_emails]); + tracker_log ("K-Mail indexing enabled : .......... %s\n", bools[tracker->index_kmail_emails]); tracker_log ("Tracker indexer parameters :"); - tracker_log ("Indexer language code : \t\t%s", tracker->language); - tracker_log ("Minimum index word length : \t\t%d", tracker->min_word_length); - tracker_log ("Maximum index word length : \t\t%d", tracker->max_word_length); - tracker_log ("Stemmer enabled : \t\t\t%s", bools[tracker->use_stemmer]); - tracker_log ("Using Pango word breaking : \t\t%s\n\n", bools[tracker->use_pango_word_break]); + tracker_log ("Indexer language code : ............ %s", tracker->language); + tracker_log ("Minimum index word length : ........ %d", tracker->min_word_length); + tracker_log ("Maximum index word length : ........ %d", tracker->max_word_length); + tracker_log ("Stemmer enabled : .................. %s", bools[tracker->use_stemmer]); + tracker_log ("Using Pango word breaking : ........ %s\n\n", bools[tracker->use_pango_word_break]); tracker->word_count = 0; tracker->word_detail_count = 0; Index: src/trackerd/tracker-db.c =================================================================== --- src/trackerd/tracker-db.c (revision 480) +++ src/trackerd/tracker-db.c (working copy) @@ -241,9 +241,7 @@ tag = g_strstrip (tag); if (strlen (tag) > 0) { - if (tracker->verbosity > 0) { - tracker_log ("Auto-tagging file with %s", tag); - } + tracker_info ("Auto-tagging file with %s", tag); } if (is_new) { @@ -797,12 +795,10 @@ return; } - if (tracker->verbosity > 0) { - if (info->is_new) { - tracker_log ("Indexing %s with service %s and mime %s (new)", info->uri, service, info->mime); - } else { - tracker_log ("Indexing %s with service %s and mime %s (existing)", info->uri, service, info->mime); - } + if (info->is_new) { + tracker_info ("Indexing %s with service %s and mime %s (new)", info->uri, service, info->mime); + } else { + tracker_info ("Indexing %s with service %s and mime %s (existing)", info->uri, service, info->mime); } str_file_id = tracker_uint_to_str (info->file_id); Index: src/trackerd/tracker-utils.c =================================================================== --- src/trackerd/tracker-utils.c (revision 480) +++ src/trackerd/tracker-utils.c (working copy) @@ -1889,7 +1889,7 @@ if (!tracker->stemmer) { tracker_log ("Warning : No stemmer could be found for language %s", language); } else { - tracker_log ("Using stemmer for language %s", language); + tracker_log ("Using stemmer for language %s\n", language); } } @@ -1922,9 +1922,9 @@ contents = g_strconcat ( "[General]\n", - "# Set to true to enable more verbose logging in the log file (setting to false will make indexing faster)\n", - "EnableDebugLogging=false\n\n", - "# Poll Interval in seconds - determines how often polling is performed when intoify/fam is not available or watch limit is exceeded\n", + "# Log Verbosity - Valid values are 0 (default, fastest), 1 (detailed), & 2 (debug)\n", + "Verbosity=0\n\n", + "# Poll Interval in seconds - determines how often polling is performed when inotify/fam is not available or watch limit is exceeded\n", "PollInterval=3600\n\n", "[Watches]\n", "# List of directory roots to index and watch seperated by semicolons\n", @@ -1951,13 +1951,13 @@ "# Sets the language specific stemmer and stopword list to use \n", "# Valid values are 'en' (english), 'da' (danish), 'nl' (dutch), 'fi' (finnish), 'fr' (french), 'de' (german), 'it' (italien), 'nb' (norwegian), 'pt' (portugese), 'ru' (russian), 'es' (spanish), 'sv' (swedish)\n", "Language=", language, "\n", - "# Enables use of language specific stemmer\n", + "# Enables use of language-specific stemmer\n", "EnableStemmer=true\n", "# Sets whether to use the slower pango word break algortihm (only set this for CJK languages which dont contain western styke word breaks)\n", "EnablePangoWordBreaks=", enable_pango, "\n\n", "[Services]\n", "IndexEvolutionEmails=true\n", - "IndexThunderbirdEmails=tru\n", + "IndexThunderbirdEmails=true\n", "IndexKmailEmails=true\n\n", "[Emails]\n", "AdditionalMBoxesToIndex=;\n\n", @@ -1987,6 +1987,10 @@ /* general options */ + if (g_key_file_has_key (key_file, "General", "Verbosity", NULL)) { + tracker->verbosity = g_key_file_get_integer (key_file, "General", "Verbosity", NULL); + } + if (g_key_file_has_key (key_file, "General", "PollInterval", NULL)) { tracker->poll_interval = g_key_file_get_integer (key_file, "General", "PollInterval", NULL);