Mercurial > dovecot > core-2.2

changeset 13112:10dcd83cd77d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
s/search score/search relevancy/
author Timo Sirainen <tss@iki.fi>
date Tue, 26 Jul 2011 14:11:23 +0300
parents 7417163fada0
children 2e15e70f5f2d
files src/imap/cmd-sort.c src/lib-storage/index/index-mail.c src/lib-storage/index/index-sort.c src/lib-storage/mail-storage.h src/plugins/fts/fts-storage.c
diffstat 5 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/cmd-sort.c	Tue Jul 26 14:10:47 2011 +0300
+++ b/src/imap/cmd-sort.c	Tue Jul 26 14:11:23 2011 +0300
@@ -19,7 +19,8 @@
 	{ MAIL_SORT_SIZE,		"size" },
 	{ MAIL_SORT_SUBJECT,		"subject" },
 	{ MAIL_SORT_TO,			"to" },
-	{ MAIL_SORT_SEARCH_SCORE,	"x-score" },
+	{ MAIL_SORT_RELEVANCY,		"x-score" }, /* FIXME: obsolete */
+	{ MAIL_SORT_RELEVANCY,		"relevancy" },
 	{ MAIL_SORT_DISPLAYFROM,	"displayfrom" },
 	{ MAIL_SORT_DISPLAYTO,		"displayto" },
 
--- a/src/lib-storage/index/index-mail.c	Tue Jul 26 14:10:47 2011 +0300
+++ b/src/lib-storage/index/index-mail.c	Tue Jul 26 14:11:23 2011 +0300
@@ -1064,7 +1064,7 @@
 	case MAIL_FETCH_FROM_ENVELOPE:
 	case MAIL_FETCH_UIDL_FILE_NAME:
 	case MAIL_FETCH_UIDL_BACKEND:
-	case MAIL_FETCH_SEARCH_SCORE:
+	case MAIL_FETCH_SEARCH_RELEVANCY:
 	case MAIL_FETCH_GUID:
 	case MAIL_FETCH_HEADER_MD5:
 	case MAIL_FETCH_POP3_ORDER:
--- a/src/lib-storage/index/index-sort.c	Tue Jul 26 14:10:47 2011 +0300
+++ b/src/lib-storage/index/index-sort.c	Tue Jul 26 14:11:23 2011 +0300
@@ -105,26 +105,26 @@
 	node->size = index_sort_get_pop3_order(mail);
 }
 
-static float index_sort_get_score(struct mail *mail)
+static float index_sort_get_relevancy(struct mail *mail)
 {
 	const char *str;
 
-	if (mail_get_special(mail, MAIL_FETCH_SEARCH_SCORE, &str) < 0)
+	if (mail_get_special(mail, MAIL_FETCH_SEARCH_RELEVANCY, &str) < 0)
 		return 0;
 	else
 		return strtod(str, NULL);
 }
 
 static void
-index_sort_list_add_score(struct mail_search_sort_program *program,
-			  struct mail *mail)
+index_sort_list_add_relevancy(struct mail_search_sort_program *program,
+			      struct mail *mail)
 {
 	ARRAY_TYPE(mail_sort_node_float) *nodes = program->context;
 	struct mail_sort_node_float *node;
 
 	node = array_append_space(nodes);
 	node->seq = mail->seq;
-	node->num = index_sort_get_score(mail);
+	node->num = index_sort_get_relevancy(mail);
 }
 
 void index_sort_list_add(struct mail_search_sort_program *program,
@@ -299,12 +299,12 @@
 		program->sort_list_finish = index_sort_list_finish_string;
 		index_sort_list_init_string(program);
 		break;
-	case MAIL_SORT_SEARCH_SCORE: {
+	case MAIL_SORT_RELEVANCY: {
 		ARRAY_TYPE(mail_sort_node_float) *nodes;
 
 		nodes = i_malloc(sizeof(*nodes));
 		i_array_init(nodes, 128);
-		program->sort_list_add = index_sort_list_add_score;
+		program->sort_list_add = index_sort_list_add_relevancy;
 		program->sort_list_finish = index_sort_list_finish_float;
 		program->context = nodes;
 		break;
@@ -513,11 +513,11 @@
 		ret = size1 < size2 ? -1 :
 			(size1 > size2 ? 1 : 0);
 		break;
-	case MAIL_SORT_SEARCH_SCORE:
+	case MAIL_SORT_RELEVANCY:
 		mail_set_seq(mail, seq1);
-		float1 = index_sort_get_score(mail);
+		float1 = index_sort_get_relevancy(mail);
 		mail_set_seq(mail, seq2);
-		float2 = index_sort_get_score(mail);
+		float2 = index_sort_get_relevancy(mail);
 
 		ret = float1 < float2 ? -1 :
 			(float1 > float2 ? 1 : 0);
--- a/src/lib-storage/mail-storage.h	Tue Jul 26 14:10:47 2011 +0300
+++ b/src/lib-storage/mail-storage.h	Tue Jul 26 14:11:23 2011 +0300
@@ -100,7 +100,7 @@
 	MAIL_SORT_SIZE		= 0x0010,
 	MAIL_SORT_SUBJECT	= 0x0020,
 	MAIL_SORT_TO		= 0x0040,
-	MAIL_SORT_SEARCH_SCORE	= 0x0080,
+	MAIL_SORT_RELEVANCY	= 0x0080,
 	MAIL_SORT_DISPLAYFROM	= 0x0100,
 	MAIL_SORT_DISPLAYTO	= 0x0200,
 	MAIL_SORT_POP3_ORDER	= 0x0400,
@@ -136,7 +136,7 @@
 	MAIL_FETCH_UIDL_FILE_NAME	= 0x00020000,
 	MAIL_FETCH_UIDL_BACKEND		= 0x00040000,
 	MAIL_FETCH_MAILBOX_NAME		= 0x00080000,
-	MAIL_FETCH_SEARCH_SCORE		= 0x00100000,
+	MAIL_FETCH_SEARCH_RELEVANCY	= 0x00100000,
 	MAIL_FETCH_GUID			= 0x00200000,
 	MAIL_FETCH_POP3_ORDER		= 0x00400000
 };
--- a/src/plugins/fts/fts-storage.c	Tue Jul 26 14:10:47 2011 +0300
+++ b/src/plugins/fts/fts-storage.c	Tue Jul 26 14:11:23 2011 +0300
@@ -289,7 +289,7 @@
 	struct fts_transaction_context *ft = FTS_CONTEXT(_mail->transaction);
 	const struct fts_score_map *scores;
 
-	if (field != MAIL_FETCH_SEARCH_SCORE || ft->scores == NULL)
+	if (field != MAIL_FETCH_SEARCH_RELEVANCY || ft->scores == NULL)
 		scores = NULL;
 	else {
 		scores = array_bsearch(&ft->scores->score_map, &_mail->uid,