debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/query: Drop the first and max_messages arguments from search_messages.

Browse source 
These only existed to support the chunky-searching hack, but that
was recently dropped anyway.
This commit is contained in:
Carl Worth 2009-11-23 20:25:13 -08:00
parent ba3554b804
commit 94eb9aacd4
6 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/notmuch.h
View file

@ -361,14 +361,6 @@ notmuch_query_search_threads (notmuch_query_t *query);
* messages object is owned by the query and as such, will only be
* valid until notmuch_query_destroy.
*
* The 'first' and 'max_messages' arguments can be used to obtain
* partial results from the search. For example, to get results 10 at
* a time, pass 'max_messages' as 10 and for 'first' pass the values
* 0, 10, 20, etc. As a special case, a value of -1 for 'max_messages'
* indicates that no limiting is to be performed. So a search with
* 'first' == 0 and 'max_messages' == -1 will return the complete
* results of the search.
*
* Typical usage might be:
*
* notmuch_query_t *query;
@ -401,8 +393,7 @@ notmuch_query_search_threads (notmuch_query_t *query);
* reason to call it if the query is about to be destroyed).
*/
notmuch_messages_t *
notmuch_query_search_messages (notmuch_query_t *query,
int first, int max_messages);
notmuch_query_search_messages (notmuch_query_t *query);
/* Destroy a notmuch_query_t along with any associated resources.
*

10
lib/query.cc
View file

@ -76,9 +76,7 @@ notmuch_query_set_sort (notmuch_query_t *query, notmuch_sort_t sort)
}
notmuch_messages_t *
notmuch_query_search_messages (notmuch_query_t *query,
int first,
int max_messages)
notmuch_query_search_messages (notmuch_query_t *query)
{
notmuch_database_t *notmuch = query->notmuch;
const char *query_string = query->query_string;
@ -130,9 +128,7 @@ notmuch_query_search_messages (notmuch_query_t *query,
enquire.set_query (final_query);
if (max_messages == -1)
max_messages = notmuch->xapian_db->get_doccount ();
mset = enquire.get_mset (first, max_messages);
mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());
for (i = mset.begin (); i != mset.end (); i++) {
notmuch_message_t *message;
@ -186,7 +182,7 @@ notmuch_query_search_threads (notmuch_query_t *query)
threads->threads = g_hash_table_new_full (g_str_hash, g_str_equal,
free, NULL);
threads->messages = notmuch_query_search_messages (query, 0, -1);
threads->messages = notmuch_query_search_messages (query);
threads->thread_id = NULL;

4
lib/thread.cc
View file

@ -260,7 +260,7 @@ _notmuch_thread_create (void *ctx,
notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
for (messages = notmuch_query_search_messages (thread_id_query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{
@ -271,7 +271,7 @@ _notmuch_thread_create (void *ctx,
notmuch_query_destroy (thread_id_query);
for (messages = notmuch_query_search_messages (matched_query, 0, -1);
for (messages = notmuch_query_search_messages (matched_query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{

2
notmuch-dump.c
View file

@ -58,7 +58,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
output = stdout;
}
for (messages = notmuch_query_search_messages (query, 0, -1);
for (messages = notmuch_query_search_messages (query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{

2
notmuch-reply.c
View file

@ -234,7 +234,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
return 1;
}
for (messages = notmuch_query_search_messages (query, 0, -1);
for (messages = notmuch_query_search_messages (query);
notmuch_messages_has_more (messages);
notmuch_messages_advance (messages))
{

2
notmuch-tag.c
View file

@ -105,7 +105,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
return 1;
}
for (messages = notmuch_query_search_messages (query, 0, -1);
for (messages = notmuch_query_search_messages (query);
notmuch_messages_has_more (messages) && !interrupted;
notmuch_messages_advance (messages))
{