annotate src/lib-storage/index/index-search.c @ 5527:3b25d89caa93 HEAD

memory leak fixes
author Timo Sirainen <tss@iki.fi>
date Wed, 04 Apr 2007 13:28:37 +0300
parents 94bc3fbdecd5
children 6789ba80419b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1 /* Copyright (C) 2002-2006 Timo Sirainen */
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
4 #include "ioloop.h"
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
5 #include "array.h"
764
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their
Timo Sirainen <tss@iki.fi>
parents: 761
diff changeset
6 #include "istream.h"
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
7 #include "str.h"
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
8 #include "message-address.h"
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
9 #include "message-date.h"
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
10 #include "message-search.h"
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
11 #include "message-parser.h"
119
2f67de235489 Whops, we were using RFC822 dates everywhere instead of IMAP dates.
Timo Sirainen <tss@iki.fi>
parents: 109
diff changeset
12 #include "imap-date.h"
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
13 #include "index-storage.h"
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
14 #include "index-mail.h"
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
15 #include "index-sort.h"
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
16 #include "mail-search.h"
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
17
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
18 #include <stdlib.h>
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
19 #include <ctype.h>
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
20
883
39e0b536e708 Storage can now specify if errors should be sent to user as BAD or NO.
Timo Sirainen <tss@iki.fi>
parents: 881
diff changeset
21 #define TXT_UNKNOWN_CHARSET "[BADCHARSET] Unknown charset"
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
22 #define TXT_INVALID_SEARCH_KEY "Invalid search key"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
23
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
24 #define SEARCH_NONBLOCK_COUNT 20
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
25 #define SEARCH_NOTIFY_INTERVAL_SECS 10
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
26
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
27 struct index_search_context {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
28 struct mail_search_context mail_ctx;
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
29 struct mail_index_view *view;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
30 struct index_mailbox *ibox;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
31
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
32 uint32_t seq1, seq2;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
33 struct mail *mail;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
34 struct index_mail *imail;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
35
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
36 pool_t search_pool;
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
37 const char *error;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
38
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
39 struct timeval search_start_time, last_notify;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
40
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
41 unsigned int failed:1;
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
42 unsigned int sorted:1;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
43 unsigned int have_seqsets:1;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
44 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
45
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
46 struct search_header_context {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
47 struct index_search_context *index_context;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
48 struct mail_search_arg *args;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
49
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
50 struct message_header_line *hdr;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
51
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
52 unsigned int parse_headers:1;
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
53 unsigned int custom_header:1;
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
54 unsigned int threading:1;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
55 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
56
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
57 struct search_body_context {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
58 struct index_search_context *index_ctx;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
59 struct istream *input;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
60 const struct message_part *part;
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
61 };
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
62
5522
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
63 static const enum message_header_parser_flags hdr_parser_flags =
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
64 MESSAGE_HEADER_PARSER_FLAG_CLEAN_ONELINE;
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
65
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
66 static int search_parse_msgset_args(struct index_mailbox *ibox,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
67 const struct mail_index_header *hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
68 struct mail_search_arg *args,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
69 uint32_t *seq1_r, uint32_t *seq2_r,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
70 bool not);
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
71
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
72 static int seqset_contains(struct mail_search_seqset *set, uint32_t seq)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
73 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
74 while (set != NULL) {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
75 if (seq >= set->seq1 && seq <= set->seq2)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
76 return TRUE;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
77 set = set->next;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
78 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
79
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
80 return FALSE;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
81 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
82
50
d493b9cc265e Introduced uoff_t which is the unsigned-equilevant of off_t. This was needed
Timo Sirainen <tss@iki.fi>
parents: 46
diff changeset
83 static uoff_t str_to_uoff_t(const char *str)
46
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
84 {
50
d493b9cc265e Introduced uoff_t which is the unsigned-equilevant of off_t. This was needed
Timo Sirainen <tss@iki.fi>
parents: 46
diff changeset
85 uoff_t num;
46
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
86
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
87 num = 0;
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
88 while (*str != '\0') {
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
89 if (*str < '0' || *str > '9')
50
d493b9cc265e Introduced uoff_t which is the unsigned-equilevant of off_t. This was needed
Timo Sirainen <tss@iki.fi>
parents: 46
diff changeset
90 return 0;
46
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
91
50
d493b9cc265e Introduced uoff_t which is the unsigned-equilevant of off_t. This was needed
Timo Sirainen <tss@iki.fi>
parents: 46
diff changeset
92 num = num*10 + (*str - '0');
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
93 str++;
46
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
94 }
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
95
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
96 return num;
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
97 }
b2bc8d2e56ff fixes for messageset handling
Timo Sirainen <tss@iki.fi>
parents: 10
diff changeset
98
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99 /* Returns >0 = matched, 0 = not matched, -1 = unknown */
3016
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
100 static int search_arg_match_index(struct index_mail *imail,
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
101 enum mail_search_arg_type type,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
102 const char *value)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
103 {
1947
777da553d1d3 Recent-flag should work now
Timo Sirainen <tss@iki.fi>
parents: 1917
diff changeset
104 const struct mail_index_record *rec = imail->data.rec;
3016
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
105 const char *const *keywords;
1947
777da553d1d3 Recent-flag should work now
Timo Sirainen <tss@iki.fi>
parents: 1917
diff changeset
106
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
107 switch (type) {
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
108 /* flags */
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
109 case SEARCH_ANSWERED:
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
110 return rec->flags & MAIL_ANSWERED;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
111 case SEARCH_DELETED:
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
112 return rec->flags & MAIL_DELETED;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
113 case SEARCH_DRAFT:
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
114 return rec->flags & MAIL_DRAFT;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
115 case SEARCH_FLAGGED:
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
116 return rec->flags & MAIL_FLAGGED;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
117 case SEARCH_SEEN:
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
118 return rec->flags & MAIL_SEEN;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
119 case SEARCH_RECENT:
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
120 return mail_get_flags(&imail->mail.mail) & MAIL_RECENT;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
121 case SEARCH_KEYWORD:
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
122 keywords = mail_get_keywords(&imail->mail.mail);
3016
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
123 if (keywords != NULL) {
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
124 while (*keywords != NULL) {
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
125 if (strcasecmp(*keywords, value) == 0)
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
126 return 1;
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
127 keywords++;
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
128 }
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
129 }
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
130 return 0;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
131
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
133 return -1;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
134 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
137 static void search_init_seqset_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
138 struct index_search_context *ctx)
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
139 {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
140 switch (arg->type) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
141 case SEARCH_SEQSET:
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
142 ctx->have_seqsets = TRUE;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
143 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
144 case SEARCH_ALL:
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
145 if (!arg->not)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
146 arg->match_always = TRUE;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
147 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
148 default:
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
149 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
150 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
151 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
152
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
153 static void search_seqset_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
154 struct index_search_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
155 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
156 if (arg->type == SEARCH_SEQSET) {
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
157 if (seqset_contains(arg->value.seqset, ctx->mail_ctx.seq))
3873
31d8f49b1a34 Compiler warning fixes and one real fix for int -> bool changes.
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
158 ARG_SET_RESULT(arg, 1);
31d8f49b1a34 Compiler warning fixes and one real fix for int -> bool changes.
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
159 else
31d8f49b1a34 Compiler warning fixes and one real fix for int -> bool changes.
Timo Sirainen <tss@iki.fi>
parents: 3863
diff changeset
160 ARG_SET_RESULT(arg, 0);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
161 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
162 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
163
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
164 static void search_index_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
165 struct index_search_context *ctx)
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
166 {
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
167 if (ctx->imail->data.rec == NULL) {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
168 /* expunged message */
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
169 ARG_SET_RESULT(arg, 0);
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
170 return;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
171 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
172
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
173 switch (search_arg_match_index(ctx->imail, arg->type,
3016
61c8d205d887 Initial support for keywords. Syncing to mbox/maildir doesn't work yet.
Timo Sirainen <tss@iki.fi>
parents: 2899
diff changeset
174 arg->value.str)) {
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
175 case -1:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
176 /* unknown */
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
177 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
178 case 0:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
179 ARG_SET_RESULT(arg, 0);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182 ARG_SET_RESULT(arg, 1);
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 break;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
187 /* Returns >0 = matched, 0 = not matched, -1 = unknown */
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
188 static int search_arg_match_cached(struct index_search_context *ctx,
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
189 enum mail_search_arg_type type,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
190 const char *value)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
191 {
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
192 time_t date, search_time;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
193 uoff_t virtual_size, search_size;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
194 int timezone_offset;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
195
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
196 switch (type) {
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
197 /* internal dates */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
198 case SEARCH_BEFORE:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
199 case SEARCH_ON:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
200 case SEARCH_SINCE:
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
201 date = mail_get_received_date(ctx->mail);
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
202 if (date == (time_t)-1)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
203 return -1;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
204
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
205 if (!imap_parse_date(value, &search_time))
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
206 return 0;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
207
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
208 switch (type) {
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
209 case SEARCH_BEFORE:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
210 return date < search_time;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
211 case SEARCH_ON:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
212 return date >= search_time &&
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
213 date < search_time + 3600*24;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
214 case SEARCH_SINCE:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
215 return date >= search_time;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
216 default:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
217 /* unreachable */
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
218 break;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
219 }
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
220
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
221 /* sent dates */
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
222 case SEARCH_SENTBEFORE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
223 case SEARCH_SENTON:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
224 case SEARCH_SENTSINCE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
225 /* NOTE: RFC-3501 specifies that timezone is ignored
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
226 in searches. date is returned as UTC, so change it. */
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
227 date = mail_get_date(ctx->mail, &timezone_offset);
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
228 if (date == (time_t)-1)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
229 return -1;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
230 date += timezone_offset * 60;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
231
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
232 if (!imap_parse_date(value, &search_time))
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
233 return 0;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
234
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
235 switch (type) {
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
236 case SEARCH_SENTBEFORE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
237 return date < search_time;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
238 case SEARCH_SENTON:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
239 return date >= search_time &&
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
240 date < search_time + 3600*24;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
241 case SEARCH_SENTSINCE:
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
242 return date >= search_time;
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
243 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
244 /* unreachable */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
245 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
246 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
247
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
248 /* sizes */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
249 case SEARCH_SMALLER:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
250 case SEARCH_LARGER:
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
251 virtual_size = mail_get_virtual_size(ctx->mail);
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
252 if (virtual_size == (uoff_t)-1)
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
253 return -1;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
254
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
255 search_size = str_to_uoff_t(value);
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
256 if (type == SEARCH_SMALLER)
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
257 return virtual_size < search_size;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
258 else
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
259 return virtual_size > search_size;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
260
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
261 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
262 return -1;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
263 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
264 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
265
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
266 static void search_cached_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
267 struct index_search_context *ctx)
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
268 {
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
269 switch (search_arg_match_cached(ctx, arg->type,
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
270 arg->value.str)) {
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
271 case -1:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
272 /* unknown */
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
273 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
274 case 0:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
275 ARG_SET_RESULT(arg, 0);
525
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
276 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
277 default:
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
278 ARG_SET_RESULT(arg, 1);
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
279 break;
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
280 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
281 }
2cb2e0a3423b Moved several fields from .imap.index file to .imap.index.data file. Fixed
Timo Sirainen <tss@iki.fi>
parents: 505
diff changeset
282
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
283 static int search_sent(enum mail_search_arg_type type, const char *search_value,
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
284 const unsigned char *sent_value, size_t sent_value_len)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
285 {
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
286 time_t search_time, sent_time;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
287 int timezone_offset;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
288
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
289 if (sent_value == NULL)
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
290 return 0;
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
291
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
292 if (!imap_parse_date(search_value, &search_time))
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
293 return 0;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
294
1340
087a9f4304ca s/latest IMAP4rev1 draft/RFC-3501/
Timo Sirainen <tss@iki.fi>
parents: 1322
diff changeset
295 /* NOTE: RFC-3501 specifies that timezone is ignored
935
bd2d99a3d601 Even more rfc822 date timezone fixes
Timo Sirainen <tss@iki.fi>
parents: 934
diff changeset
296 in searches. sent_time is returned as UTC, so change it. */
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
297 if (!message_date_parse(sent_value, sent_value_len,
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
298 &sent_time, &timezone_offset))
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
299 return 0;
1604
6a18854e6856 Still more timezone fixes
Timo Sirainen <tss@iki.fi>
parents: 1552
diff changeset
300 sent_time += timezone_offset * 60;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
301
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
302 switch (type) {
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
303 case SEARCH_SENTBEFORE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
304 return sent_time < search_time;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
305 case SEARCH_SENTON:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
306 return sent_time >= search_time &&
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
307 sent_time < search_time + 3600*24;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
308 case SEARCH_SENTSINCE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
309 return sent_time >= search_time;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
310 default:
546
e1254b838e0b Added --enable-asserts (default) and fixed some warnings when building
Timo Sirainen <tss@iki.fi>
parents: 534
diff changeset
311 i_unreached();
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
312 }
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
313 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
314
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
315 static struct message_search_context *
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
316 msg_search_arg_context(struct index_search_context *ctx,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
317 struct mail_search_arg *arg)
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
318 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
319 struct message_search_context *arg_ctx = arg->context;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
320 enum message_search_flags flags;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
321 int ret;
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
322
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
323 if (arg_ctx != NULL)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
324 return arg_ctx;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
325
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
326 if (ctx->search_pool == NULL)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
327 ctx->search_pool = pool_alloconly_create("search pool", 8192);
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
328
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
329 flags = (arg->type == SEARCH_BODY || arg->type == SEARCH_BODY_FAST) ?
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
330 MESSAGE_SEARCH_FLAG_SKIP_HEADERS : 0;
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
331
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
332 ret = message_search_init(ctx->search_pool, arg->value.str,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
333 ctx->mail_ctx.charset, flags,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
334 &arg_ctx);
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
335 if (ret > 0) {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
336 arg->context = arg_ctx;
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
337 return arg_ctx;
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
338 }
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
339 if (ret == 0)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
340 ctx->error = TXT_UNKNOWN_CHARSET;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
341 else
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
342 ctx->error = TXT_INVALID_SEARCH_KEY;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
343 return NULL;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
344 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
345
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
346 static void search_header_arg(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
347 struct search_header_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
348 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
349 struct message_search_context *msg_search_ctx;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
350 struct message_block block;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
351 int ret;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
352
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
353 /* first check that the field name matches to argument. */
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
354 switch (arg->type) {
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
355 case SEARCH_SENTBEFORE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
356 case SEARCH_SENTON:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
357 case SEARCH_SENTSINCE:
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
358 /* date is handled differently than others */
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
359 if (strcasecmp(ctx->hdr->name, "Date") == 0) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
360 if (ctx->hdr->continues) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
361 ctx->hdr->use_full_value = TRUE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
362 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
363 }
1070
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
364 ret = search_sent(arg->type, arg->value.str,
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
365 ctx->hdr->full_value,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
366 ctx->hdr->full_value_len);
1070
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
367 ARG_SET_RESULT(arg, ret);
408
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
368 }
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
369 return;
e057845d94ca Dropped sent_time and alignment from MailIndexRecord. SEARCH can now use
Timo Sirainen <tss@iki.fi>
parents: 369
diff changeset
370
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
371 case SEARCH_HEADER:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
372 case SEARCH_HEADER_ADDRESS:
10
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
373 ctx->custom_header = TRUE;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
374
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
375 if (strcasecmp(ctx->hdr->name, arg->hdr_field_name) != 0)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
376 return;
5513
Timo Sirainen <tss@iki.fi>
parents: 5507
diff changeset
377 break;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
378 default:
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
379 return;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
380 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
381
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
382 if (arg->value.str[0] == '\0') {
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
383 /* we're just testing existence of the field. always matches. */
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
384 ARG_SET_RESULT(arg, 1);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
385 return;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
386 }
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
387
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
388 if (ctx->hdr->continues) {
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
389 ctx->hdr->use_full_value = TRUE;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
390 return;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
391 }
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
392
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
393 memset(&block, 0, sizeof(block));
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
394 msg_search_ctx = msg_search_arg_context(ctx->index_context, arg);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
395 if (msg_search_ctx == NULL)
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
396 ret = 0;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
397 else if (arg->type == SEARCH_HEADER_ADDRESS) {
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
398 /* we have to match against normalized address */
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
399 struct message_address *addr;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
400 string_t *str;
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
401
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
402 t_push();
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
403 addr = message_address_parse(pool_datastack_create(),
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
404 ctx->hdr->full_value,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
405 ctx->hdr->full_value_len,
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
406 (unsigned int)-1, TRUE);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
407 str = t_str_new(ctx->hdr->value_len);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
408 message_address_write(str, addr);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
409 block.data = str_data(str);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
410 block.size = str_len(str);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
411 ret = message_search_more_decoded(msg_search_ctx, &block);
880
d5168cca2052 SEARCHing headers with "" value should always match if the header is found.
Timo Sirainen <tss@iki.fi>
parents: 825
diff changeset
412 t_pop();
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
413 } else {
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
414 block.data = ctx->hdr->full_value;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
415 block.size = ctx->hdr->full_value_len;
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
416 ret = message_search_more_decoded(msg_search_ctx, &block);
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
417 }
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
418
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
419 if (ret > 0 ||
5507
65250cfebd74 Don't handle TEXT searches in header searches. It's done later anyway.
Timo Sirainen <tss@iki.fi>
parents: 5505
diff changeset
420 (arg->type != SEARCH_HEADER &&
65250cfebd74 Don't handle TEXT searches in header searches. It's done later anyway.
Timo Sirainen <tss@iki.fi>
parents: 5505
diff changeset
421 arg->type != SEARCH_HEADER_ADDRESS)) {
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
422 /* set only when we definitely know if it's a match */
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
423 ARG_SET_RESULT(arg, ret);
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
424 }
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
425 }
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
426
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
427 static void search_header_unmatch(struct mail_search_arg *arg,
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
428 void *context __attr_unused__)
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
429 {
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
430 switch (arg->type) {
1070
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
431 case SEARCH_SENTBEFORE:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
432 case SEARCH_SENTON:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
433 case SEARCH_SENTSINCE:
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
434 if (arg->not) {
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
435 /* date header not found, so we match only for
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
436 NOT searches */
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
437 ARG_SET_RESULT(arg, 0);
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
438 }
5c34c363a062 Fixes to SEARCH SENT*
Timo Sirainen <tss@iki.fi>
parents: 1069
diff changeset
439 break;
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
440 case SEARCH_HEADER:
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
441 case SEARCH_HEADER_ADDRESS:
1069
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
442 ARG_SET_RESULT(arg, 0);
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
443 break;
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
444 default:
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
445 break;
8024a2cdc406 Several search fixes, mostly related to matching multiple conditions.
Timo Sirainen <tss@iki.fi>
parents: 1066
diff changeset
446 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
447 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
448
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
449 static void search_header(struct message_header_line *hdr,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
450 struct search_header_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
451 {
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
452 if (hdr == NULL) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
453 /* end of headers, mark all unknown SEARCH_HEADERs unmatched */
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
454 mail_search_args_foreach(ctx->args, search_header_unmatch, ctx);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
455 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
456 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
457
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
458 if (hdr->eoh)
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
459 return;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
460
3325
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
461 if (ctx->parse_headers)
38eaa792c405 Don't call index_mail_parse_header() twice when searching headers. Caused
Timo Sirainen <tss@iki.fi>
parents: 3301
diff changeset
462 index_mail_parse_header(NULL, hdr, ctx->index_context->imail);
924
4f697dde0fca THREAD=REFERENCES implementation. Doesn't crash, but I'm not sure how
Timo Sirainen <tss@iki.fi>
parents: 903
diff changeset
463
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
464 if (ctx->custom_header || strcasecmp(hdr->name, "Date") == 0) {
1322
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than
Timo Sirainen <tss@iki.fi>
parents: 1070
diff changeset
465 ctx->hdr = hdr;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
466
10
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
467 ctx->custom_header = FALSE;
82b7de533f98 s/user_data/context/ and some s/Data/Context/
Timo Sirainen <tss@iki.fi>
parents: 5
diff changeset
468 mail_search_args_foreach(ctx->args, search_header_arg, ctx);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
469 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
470 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
471
4907
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
472 static void search_body(struct mail_search_arg *arg,
5b4c9b20eba0 Replaced void *context from a lot of callbacks with the actual context
Timo Sirainen <tss@iki.fi>
parents: 4635
diff changeset
473 struct search_body_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
474 {
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
475 struct message_search_context *msg_search_ctx;
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
476 int ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
477
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
478 if (ctx->index_ctx->error != NULL)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
479 return;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
480
4942
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
481 switch (arg->type) {
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
482 case SEARCH_BODY:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
483 case SEARCH_BODY_FAST:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
484 case SEARCH_TEXT:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
485 case SEARCH_TEXT_FAST:
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
486 break;
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
487 default:
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
488 return;
4942
b382b21409b5 Added support for X-BODY-FAST and X-TEXT-FAST SEARCH arguments. FTS plugin
Timo Sirainen <tss@iki.fi>
parents: 4939
diff changeset
489 }
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
490
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
491 msg_search_ctx = msg_search_arg_context(ctx->index_ctx, arg);
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
492 if (msg_search_ctx == NULL) {
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
493 ARG_SET_RESULT(arg, 0);
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
494 return;
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
495 }
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
496
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
497 i_stream_seek(ctx->input, 0);
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
498 ret = message_search_msg(msg_search_ctx, ctx->input, ctx->part);
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
499 if (ret < 0) {
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
500 mail_cache_set_corrupted(ctx->index_ctx->ibox->cache,
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
501 "Broken message structure for mail UID %u",
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
502 ctx->index_ctx->mail->uid);
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
503
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
504 /* get the body parts, and try again */
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
505 ctx->index_ctx->imail->data.parts = NULL;
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
506
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
507 i_stream_seek(ctx->input, 0);
5525
94bc3fbdecd5 Removed message body/header searchers. They're now combined into one
Timo Sirainen <tss@iki.fi>
parents: 5522
diff changeset
508 ret = message_search_msg(msg_search_ctx, ctx->input, NULL);
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
509 if (ret < 0)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
510 i_panic("Couldn't fix broken body structure");
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
511 }
290
3dcc2275b4ca IOBuffer cleanup, hopefully fixes some mbox problems.
Timo Sirainen <tss@iki.fi>
parents: 223
diff changeset
512
3795
e6c42de08336 Allow message_body_search() to return "message_part is broken" error. If it
Timo Sirainen <tss@iki.fi>
parents: 3467
diff changeset
513 ARG_SET_RESULT(arg, ret > 0);
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
514 }
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
515
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
516 static bool search_arg_match_text(struct mail_search_arg *args,
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
517 struct index_search_context *ctx)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
518 {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
519 struct istream *input;
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
520 struct mailbox_header_lookup_ctx *headers_ctx;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
521 const char *const *headers;
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
522 bool have_headers, have_body;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
523
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
524 /* first check what we need to use */
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
525 headers = mail_search_args_analyze(args, &have_headers, &have_body);
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
526 if (!have_headers && !have_body)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
527 return TRUE;
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
528
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
529 if (have_headers) {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
530 struct search_header_context hdr_ctx;
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
531
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
532 if (have_body)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
533 headers = NULL;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
534
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
535 if (headers == NULL) {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
536 headers_ctx = NULL;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
537 input = mail_get_stream(ctx->mail, NULL, NULL);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
538 if (input == NULL)
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
539 return FALSE;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
540 } else {
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
541 /* FIXME: do this once in init */
3301
dd19f2e8575f Don't even try to allow searching zero number of headers.
Timo Sirainen <tss@iki.fi>
parents: 3248
diff changeset
542 i_assert(*headers != NULL);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
543 headers_ctx =
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
544 mailbox_header_lookup_init(&ctx->ibox->box,
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
545 headers);
3248
ff47e78ad717 Renamed mail_get_header() to mail_get_first_header() and mail_gets_headers()
Timo Sirainen <tss@iki.fi>
parents: 3209
diff changeset
546 input = mail_get_header_stream(ctx->mail, headers_ctx);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
547 if (input == NULL) {
3879
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3873
diff changeset
548 mailbox_header_lookup_deinit(&headers_ctx);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
549 return FALSE;
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
550 }
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
551 }
715
3e952f64b2ec Non-envelope-cached header searching wasn't working. Also now search works
Timo Sirainen <tss@iki.fi>
parents: 678
diff changeset
552
568
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
553 memset(&hdr_ctx, 0, sizeof(hdr_ctx));
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
554 hdr_ctx.index_context = ctx;
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
555 hdr_ctx.custom_header = TRUE;
f2aa58c2afd0 SEARCH CHARSET support. Currently we do it through iconv() and only ASCII
Timo Sirainen <tss@iki.fi>
parents: 559
diff changeset
556 hdr_ctx.args = args;
5516
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
557 hdr_ctx.parse_headers = headers == NULL &&
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
558 index_mail_want_parse_headers(ctx->imail);
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
559
5516
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
560 if (hdr_ctx.parse_headers)
96f0b56489a2 Don't feed index_mail_parser headers while searching message bodies, unless
Timo Sirainen <tss@iki.fi>
parents: 5513
diff changeset
561 index_mail_parse_header_init(ctx->imail, headers_ctx);
5522
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
562 message_parse_header(input, NULL, hdr_parser_flags,
5dee807e53cf Header parser has now flags parameter to tell it how to handle linefeeds.
Timo Sirainen <tss@iki.fi>
parents: 5516
diff changeset
563 search_header, &hdr_ctx);
2327
7d02e2a7672d Header caching redesigned. New design allows caching decisions per field, so
Timo Sirainen <tss@iki.fi>
parents: 2298
diff changeset
564 if (headers_ctx != NULL)
3879
928229f8b3e6 deinit, unref, destroy, close, free, etc. functions now take a pointer to
Timo Sirainen <tss@iki.fi>
parents: 3873
diff changeset
565 mailbox_header_lookup_deinit(&headers_ctx);
715
3e952f64b2ec Non-envelope-cached header searching wasn't working. Also now search works
Timo Sirainen <tss@iki.fi>
parents: 678
diff changeset
566 } else {
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
567 struct message_size hdr_size;
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
568
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
569 input = mail_get_stream(ctx->mail, &hdr_size, NULL);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
570 if (input == NULL)
715
3e952f64b2ec Non-envelope-cached header searching wasn't working. Also now search works
Timo Sirainen <tss@iki.fi>
parents: 678
diff changeset
571 return FALSE;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
572
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
573 i_stream_seek(input, hdr_size.physical_size);
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
574 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
575
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
576 if (have_body) {
903
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the
Timo Sirainen <tss@iki.fi>
parents: 898
diff changeset
577 struct search_body_context body_ctx;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
578
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
579 memset(&body_ctx, 0, sizeof(body_ctx));
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
580 body_ctx.index_ctx = ctx;
764
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their
Timo Sirainen <tss@iki.fi>
parents: 761
diff changeset
581 body_ctx.input = input;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
582 body_ctx.part = mail_get_parts(ctx->mail);
608
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
583
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body
Timo Sirainen <tss@iki.fi>
parents: 569
diff changeset
584 mail_search_args_foreach(args, search_body, &body_ctx);
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
585 }
5
1b34ec11fff8 Message data is parsed in blocks (no longer entirely mmap()ed). Several
Timo Sirainen <tss@iki.fi>
parents: 0
diff changeset
586 return TRUE;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
587 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
588
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
589 static void update_seqs(const struct mail_search_seqset *set,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
590 const struct mail_index_header *hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
591 uint32_t *seq1_r, uint32_t *seq2_r, bool not)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
592 {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
593 if (!not) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
594 /* seq1..seq2 */
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
595 if (*seq1_r < set->seq1 || *seq1_r == 0)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
596 *seq1_r = set->seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
597 if (*seq2_r > set->seq2)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
598 *seq2_r = set->seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
599 } else {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
600 if (set->seq1 == 1) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
601 /* seq2+1..count */
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
602 if (set->seq2 == hdr->messages_count) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
603 /* completely outside our range */
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
604 *seq1_r = (uint32_t)-1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
605 *seq2_r = 0;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
606 } else {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
607 if (*seq1_r < set->seq2 + 1)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
608 *seq1_r = set->seq2 + 1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
609 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
610 } else if (set->seq2 == hdr->messages_count) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
611 /* 1..seq1-1 */
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
612 if (*seq2_r > set->seq1 - 1)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
613 *seq2_r = set->seq1 - 1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
614 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
615 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
616 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
617
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
618 static int search_msgset_fix(struct index_mailbox *ibox,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
619 const struct mail_index_header *hdr,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
620 struct mail_search_seqset *set,
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
621 uint32_t *seq1_r, uint32_t *seq2_r, bool not)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
622 {
4439
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
623 struct mail_search_seqset full_set;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
624 uint32_t min_seq = (uint32_t)-1, max_seq = 0;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
625
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
626 for (; set != NULL; set = set->next) {
3467
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
627 if (set->seq1 > hdr->messages_count) {
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
628 if (set->seq1 != (uint32_t)-1 &&
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
629 set->seq2 != (uint32_t)-1) {
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
630 set->seq1 = set->seq2 = 0;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
631 if (not)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
632 continue;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
633
3467
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
634 /* completely outside our range */
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
635 *seq1_r = (uint32_t)-1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
636 *seq2_r = 0;
3467
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
637 return 0;
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
638 }
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
639 /* either seq1 or seq2 is '*', so the last message is
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
640 in range. */
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
641 set->seq1 = hdr->messages_count;
3467
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
642 }
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
643 if (set->seq2 > hdr->messages_count)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
644 set->seq2 = hdr->messages_count;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
645
3467
b75125eced7f Moved sequence set range checks to imap-specific code, so that SEARCH can
Timo Sirainen <tss@iki.fi>
parents: 3325
diff changeset
646 if (set->seq1 == 0 || set->seq2 == 0) {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
647 mail_storage_set_syntax_error(ibox->box.storage,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
648 "Invalid messageset");
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
649 return -1;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
650 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
651
4439
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
652 if (set->seq1 < min_seq)
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
653 min_seq = set->seq1;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
654 if (set->seq2 > max_seq)
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
655 max_seq = set->seq2;
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
656 }
4439
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
657
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
658 full_set.seq1 = min_seq;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
659 full_set.seq2 = max_seq;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
660 full_set.next = NULL;
12b5fbb3a05c Searching (storing, fetching) with sequence sets containing commas was
Timo Sirainen <tss@iki.fi>
parents: 4438
diff changeset
661 update_seqs(&full_set, hdr, seq1_r, seq2_r, not);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
662 return 0;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
663 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
664
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
665 static int search_or_parse_msgset_args(struct index_mailbox *ibox,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
666 const struct mail_index_header *hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
667 struct mail_search_arg *args,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
668 uint32_t *seq1_r, uint32_t *seq2_r,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
669 bool not)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
670 {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
671 uint32_t seq1, seq2, min_seq1 = 0, max_seq2 = 0;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
672
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
673 for (; args != NULL; args = args->next) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
674 bool cur_not = args->not;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
675
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
676 if (not)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
677 cur_not = !cur_not;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
678 seq1 = 1; seq2 = hdr->messages_count;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
679
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
680 if (args->type == SEARCH_SUB) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
681 if (search_parse_msgset_args(ibox, hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
682 args->value.subargs,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
683 &seq1, &seq2, cur_not) < 0)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
684 return -1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
685 } else if (args->type == SEARCH_OR) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
686 if (search_or_parse_msgset_args(ibox, hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
687 args->value.subargs,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
688 &seq1, &seq2,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
689 cur_not) < 0)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
690 return -1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
691 } else if (args->type == SEARCH_SEQSET) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
692 if (search_msgset_fix(ibox, hdr, args->value.seqset,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
693 &seq1, &seq2, cur_not) < 0)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
694 return -1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
695 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
696
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
697 if (min_seq1 == 0) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
698 min_seq1 = seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
699 max_seq2 = seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
700 } else {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
701 if (seq1 < min_seq1)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
702 min_seq1 = seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
703 if (seq2 > max_seq2)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
704 max_seq2 = seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
705 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
706 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
707 i_assert(min_seq1 != 0);
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
708
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
709 if (min_seq1 > *seq1_r)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
710 *seq1_r = min_seq1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
711 if (max_seq2 < *seq2_r)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
712 *seq2_r = max_seq2;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
713 return 0;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
714 }
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
715
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
716 static int search_parse_msgset_args(struct index_mailbox *ibox,
1917
68938dccbc45 Forced locking to be right with mprotect()ing index file. Support for
Timo Sirainen <tss@iki.fi>
parents: 1915
diff changeset
717 const struct mail_index_header *hdr,
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
718 struct mail_search_arg *args,
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
719 uint32_t *seq1_r, uint32_t *seq2_r,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
720 bool not)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
721 {
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
722 for (; args != NULL; args = args->next) {
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
723 bool cur_not = args->not;
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
724
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
725 if (not)
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
726 cur_not = !cur_not;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
727
1376
1664a3d51a74 More SEARCH OR fixes.
Timo Sirainen <tss@iki.fi>
parents: 1375
diff changeset
728 if (args->type == SEARCH_SUB) {
1917
68938dccbc45 Forced locking to be right with mprotect()ing index file. Support for
Timo Sirainen <tss@iki.fi>
parents: 1915
diff changeset
729 if (search_parse_msgset_args(ibox, hdr,
68938dccbc45 Forced locking to be right with mprotect()ing index file. Support for
Timo Sirainen <tss@iki.fi>
parents: 1915
diff changeset
730 args->value.subargs,
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
731 seq1_r, seq2_r,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
732 cur_not) < 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
733 return -1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
734 } else if (args->type == SEARCH_OR) {
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
735 /* go through our children and use the widest seqset
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
736 range */
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
737 if (search_or_parse_msgset_args(ibox, hdr,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
738 args->value.subargs,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
739 seq1_r, seq2_r,
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
740 cur_not) < 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
741 return -1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
742 } else if (args->type == SEARCH_SEQSET) {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
743 if (search_msgset_fix(ibox, hdr, args->value.seqset,
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
744 seq1_r, seq2_r, cur_not) < 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
745 return -1;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
746 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
747 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
748 return 0;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
749 }
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
750
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
751 static int search_limit_lowwater(struct index_search_context *ctx,
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
752 uint32_t uid_lowwater, uint32_t *first_seq)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
753 {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
754 uint32_t seq1, seq2;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
755
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
756 if (uid_lowwater == 0)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
757 return 0;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
758
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
759 if (mail_index_lookup_uid_range(ctx->view, uid_lowwater,
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
760 (uint32_t)-1, &seq1, &seq2) < 0) {
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
761 mail_storage_set_index_error(ctx->ibox);
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
762 return -1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
763 }
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
764
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
765 if (*first_seq < seq1)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
766 *first_seq = seq1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
767 return 0;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
768 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
769
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
770 static int search_limit_by_flags(struct index_search_context *ctx,
1917
68938dccbc45 Forced locking to be right with mprotect()ing index file. Support for
Timo Sirainen <tss@iki.fi>
parents: 1915
diff changeset
771 const struct mail_index_header *hdr,
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
772 struct mail_search_arg *args,
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
773 uint32_t *seq1, uint32_t *seq2)
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
774 {
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
775 for (; args != NULL; args = args->next) {
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
776 switch (args->type) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
777 case SEARCH_SEEN:
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
778 /* SEEN with 0 seen? */
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
779 if (!args->not && hdr->seen_messages_count == 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
780 return 0;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
781
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
782 if (hdr->seen_messages_count == hdr->messages_count) {
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
783 /* UNSEEN with all seen? */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
784 if (args->not)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
785 return 0;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
786
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
787 /* SEEN with all seen */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
788 args->match_always = TRUE;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
789 } else if (args->not) {
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
790 /* UNSEEN with lowwater limiting */
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
791 if (search_limit_lowwater(ctx,
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
792 hdr->first_unseen_uid_lowwater,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
793 seq1) < 0)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
794 return -1;
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
795 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
796 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
797 case SEARCH_DELETED:
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
798 /* DELETED with 0 deleted? */
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
799 if (!args->not && hdr->deleted_messages_count == 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
800 return 0;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
801
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
802 if (hdr->deleted_messages_count ==
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
803 hdr->messages_count) {
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
804 /* UNDELETED with all deleted? */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
805 if (args->not)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
806 return 0;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
807
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
808 /* DELETED with all deleted */
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
809 args->match_always = TRUE;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
810 } else if (!args->not) {
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
811 /* DELETED with lowwater limiting */
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
812 if (search_limit_lowwater(ctx,
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
813 hdr->first_deleted_uid_lowwater,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
814 seq1) < 0)
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
815 return -1;
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
816 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
817 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
818 case SEARCH_ALL:
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
819 if (args->not)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
820 return 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
821 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
822 default:
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
823 break;
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
824 }
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
825 }
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
826
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
827 return *seq1 <= *seq2;
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
828 }
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
829
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
830 static int search_get_seqset(struct index_search_context *ctx,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
831 struct mail_search_arg *args)
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
832 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
833 const struct mail_index_header *hdr;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
834 int ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
835
2892
62d53b49110d Changed mail_index_get_header() to return the header as return value because
Timo Sirainen <tss@iki.fi>
parents: 2883
diff changeset
836 hdr = mail_index_get_header(ctx->view);
1985
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
837 if (hdr->messages_count == 0) {
2899
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
838 /* no messages, don't check sequence ranges. although we could
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
839 give error message then for FETCH, we shouldn't do it for
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
840 UID FETCH. */
1985
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
841 ctx->seq1 = 1;
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
842 ctx->seq2 = 0;
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
843 return 0;
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
844 }
3ccd4eb52ee4 don't crash when requesting messages from empty mailbox
Timo Sirainen <tss@iki.fi>
parents: 1958
diff changeset
845
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
846 ctx->seq1 = 1;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
847 ctx->seq2 = hdr->messages_count;
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
848
2899
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
849 if (search_parse_msgset_args(ctx->ibox, hdr, args,
4431
2461061327ed NOT condition wasn't handled correctly in SEARCH.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4303
diff changeset
850 &ctx->seq1, &ctx->seq2, FALSE) < 0)
2899
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
851 return -1;
1a05764af1e0 UID FETCH * gave error message with empty mailbox.
Timo Sirainen <tss@iki.fi>
parents: 2892
diff changeset
852
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
853 if (ctx->seq1 == 0) {
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
854 ctx->seq1 = 1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
855 ctx->seq2 = hdr->messages_count;
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
856 }
4438
00db36e1b734 Don't crash when different search conditions reduce the search range so that
Timo Sirainen <tss@iki.fi>
parents: 4432
diff changeset
857 if (ctx->seq1 > ctx->seq2) {
4432
c13d8fe698f8 Don't crash if seqset restrictions caused no messages to be searched.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4431
diff changeset
858 /* no matches */
c13d8fe698f8 Don't crash if seqset restrictions caused no messages to be searched.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4431
diff changeset
859 return 0;
c13d8fe698f8 Don't crash if seqset restrictions caused no messages to be searched.
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4431
diff changeset
860 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
861
442
2a25bf21557b SEARCH SEEN, UNSEEN, DELETED, UNDELETED, RECENT, UNRECENT optimizations.
Timo Sirainen <tss@iki.fi>
parents: 441
diff changeset
862 /* UNSEEN and DELETED in root search level may limit the range */
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
863 ret = search_limit_by_flags(ctx, hdr, args, &ctx->seq1, &ctx->seq2);
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
864 if (ret < 0)
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
865 return -1;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
866 if (ret == 0) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
867 /* no matches */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
868 ctx->seq1 = 1;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
869 ctx->seq2 = 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
870 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
871 return 0;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
872 }
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
873
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
874 struct mail_search_context *
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
875 index_storage_search_init(struct mailbox_transaction_context *_t,
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
876 const char *charset, struct mail_search_arg *args,
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
877 const enum mail_sort_type *sort_program)
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
878 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
879 struct index_transaction_context *t =
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
880 (struct index_transaction_context *)_t;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
881 struct index_search_context *ctx;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
882
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
883 ctx = i_new(struct index_search_context, 1);
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
884 ctx->mail_ctx.transaction = _t;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
885 ctx->ibox = t->ibox;
2224
a816e2d88406 Added mail_index_transaction_get_updated_view() which can be used to access
Timo Sirainen <tss@iki.fi>
parents: 2190
diff changeset
886 ctx->view = t->trans_view;
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
887 ctx->mail_ctx.charset = i_strdup(charset);
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
888 ctx->mail_ctx.args = args;
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
889 ctx->mail_ctx.sort_program = index_sort_program_init(_t, sort_program);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
890
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
891 array_create(&ctx->mail_ctx.module_contexts, default_pool,
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
892 sizeof(void *), 5);
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
893
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
894 mail_search_args_reset(ctx->mail_ctx.args, TRUE);
1844
4c2678dd65f1 Some optimizations to messageset handling in search.
Timo Sirainen <tss@iki.fi>
parents: 1782
diff changeset
895
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
896 if (search_get_seqset(ctx, args) < 0) {
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
897 ctx->failed = TRUE;
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
898 ctx->seq1 = 1;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
899 ctx->seq2 = 0;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
900 } else {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
901 (void)mail_search_args_foreach(args, search_init_seqset_arg,
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
902 ctx);
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
903 /* Need to reset results for match_always cases */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
904 mail_search_args_reset(ctx->mail_ctx.args, FALSE);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
905 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
906 return &ctx->mail_ctx;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
907 }
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
908
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
909 static void search_arg_deinit(struct mail_search_arg *arg,
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
910 void *context __attr_unused__)
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
911 {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
912 struct message_search_context *search_ctx = arg->context;
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
913
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
914 if (search_ctx != NULL) {
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
915 message_search_deinit(&search_ctx);
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
916 arg->context = NULL;
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
917 }
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
918 }
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
919
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
920 int index_storage_search_deinit(struct mail_search_context *_ctx)
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
921 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
922 struct index_search_context *ctx = (struct index_search_context *)_ctx;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
923 int ret;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
924
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
925 ret = ctx->failed || ctx->error != NULL ? -1 : 0;
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
926
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
927 if (ctx->error != NULL) {
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
928 mail_storage_set_error(ctx->ibox->box.storage,
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
929 "%s", ctx->error);
962
3b139ccc1858 SEARCH didn't properly complain about invalid messagesets. high:low never
Timo Sirainen <tss@iki.fi>
parents: 951
diff changeset
930 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
931
5527
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
932 mail_search_args_reset(ctx->mail_ctx.args, FALSE);
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
933 (void)mail_search_args_foreach(ctx->mail_ctx.args,
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
934 search_arg_deinit, NULL);
3b25d89caa93 memory leak fixes
Timo Sirainen <tss@iki.fi>
parents: 5525
diff changeset
935
5504
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
936 if (ctx->search_pool != NULL)
9414946e1eb0 Message body search API changed to init/search/deinit. Searching now builds
Timo Sirainen <tss@iki.fi>
parents: 4949
diff changeset
937 pool_unref(ctx->search_pool);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
938
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
939 if (ctx->mail_ctx.sort_program != NULL)
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
940 index_sort_program_deinit(&ctx->mail_ctx.sort_program);
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
941 array_free(&ctx->mail_ctx.module_contexts);
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
942 i_free(ctx->mail_ctx.charset);
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
943 i_free(ctx);
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
944 return ret;
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
945 }
327
276b7a53c264 Modify log fixes. STORE and SEARCH didn't handle properly message sequence
Timo Sirainen <tss@iki.fi>
parents: 317
diff changeset
946
3863
55df57c028d4 Added "bool" type and changed all ints that were used as booleans to bool.
Timo Sirainen <tss@iki.fi>
parents: 3795
diff changeset
947 static bool search_match_next(struct index_search_context *ctx)
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
948 {
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
949 struct mail_search_arg *arg;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
950 int ret;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
951
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
952 /* check the index matches first */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
953 ret = mail_search_args_foreach(ctx->mail_ctx.args,
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
954 search_index_arg, ctx);
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
955 if (ret >= 0)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
956 return ret > 0;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
957
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
958 if (ctx->imail->data.rec == NULL) {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
959 /* expunged message, no way to check if the rest would have
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
960 matched */
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
961 return FALSE;
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
962 }
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
963
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
964 /* next search only from cached arguments */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
965 ret = mail_search_args_foreach(ctx->mail_ctx.args,
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
966 search_cached_arg, ctx);
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
967 if (ret >= 0)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
968 return ret > 0;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
969
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
970 /* open the mail file and check the rest */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
971 if (!search_arg_match_text(ctx->mail_ctx.args, ctx))
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
972 return FALSE;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
973
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
974 for (arg = ctx->mail_ctx.args; arg != NULL; arg = arg->next) {
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
975 if (arg->result != 1)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
976 return FALSE;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
977 }
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
978
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
979 return TRUE;
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
980 }
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
981
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
982 static void index_storage_search_notify(struct mailbox *box,
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
983 struct index_search_context *ctx)
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
984 {
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
985 const struct mail_index_header *hdr;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
986 const char *text;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
987 float percentage;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
988 unsigned int msecs, secs;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
989
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
990 if (ctx->last_notify.tv_sec == 0) {
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
991 /* set the search time in here, in case a plugin
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
992 already spent some time indexing the mailbox */
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
993 ctx->search_start_time = ioloop_timeval;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
994 } else if (box->storage->callbacks->notify_ok != NULL) {
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
995 hdr = mail_index_get_header(ctx->ibox->view);
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
996
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
997 percentage = ctx->mail->seq * 100.0 / hdr->messages_count;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
998 msecs = (ioloop_timeval.tv_sec -
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
999 ctx->search_start_time.tv_sec) * 1000 +
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1000 (ioloop_timeval.tv_usec -
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1001 ctx->search_start_time.tv_usec) / 1000;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1002 secs = (msecs / (percentage / 100.0) - msecs) / 1000;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1003
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1004 t_push();
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1005 text = t_strdup_printf("Searched %d%% of the mailbox, "
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1006 "ETA %d:%02d", (int)percentage,
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1007 secs/60, secs%60);
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1008 box->storage->callbacks->
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1009 notify_ok(box, text, box->storage->callback_context);
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1010 t_pop();
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1011 }
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1012 ctx->last_notify = ioloop_timeval;
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1013 }
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1014
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1015 int index_storage_search_next_nonblock(struct mail_search_context *_ctx,
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1016 struct mail *mail, bool *tryagain_r)
988
8028c4dcf38f mail-storage.h interface changes, affects pretty much everything.
Timo Sirainen <tss@iki.fi>
parents: 962
diff changeset
1017 {
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1018 struct index_search_context *ctx = (struct index_search_context *)_ctx;
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1019 struct mailbox *box = _ctx->transaction->box;
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1020 unsigned int count = 0;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1021 int ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1022
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1023 *tryagain_r = FALSE;
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1024
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1025 if (ctx->sorted) {
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1026 /* everything searched at this point already. just returning
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1027 matches from sort list */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1028 return index_sort_list_next(ctx->mail_ctx.sort_program, mail);
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1029 }
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1030
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1031 ctx->mail = mail;
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1032 ctx->imail = (struct index_mail *)mail;
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1033
4949
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1034 if (ioloop_time - ctx->last_notify.tv_sec >=
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1035 SEARCH_NOTIFY_INTERVAL_SECS)
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1036 index_storage_search_notify(box, ctx);
a959d4208b54 Moved storage callbacks to struct mail_storage. If searching takes over 10
Timo Sirainen <tss@iki.fi>
parents: 4942
diff changeset
1037
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1038 while ((ret = box->v.search_next_update_seq(_ctx)) > 0) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1039 if (mail_set_seq(mail, _ctx->seq) < 0) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1040 ret = -1;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1041 break;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1042 }
453
0f6fd6802265 Modify log now stores the changes in ranges, so store 1:100 doesn't
Timo Sirainen <tss@iki.fi>
parents: 450
diff changeset
1043
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1044 t_push();
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1045 ret = search_match_next(ctx) ? 1 : 0;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1046 t_pop();
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1047
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1048 mail_search_args_reset(ctx->mail_ctx.args, FALSE);
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1049
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1050 if (ctx->error != NULL)
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1051 ret = -1;
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1052 if (ret != 0) {
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1053 if (ctx->mail_ctx.sort_program == NULL)
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1054 break;
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1055
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1056 if (index_sort_list_add(ctx->mail_ctx.sort_program,
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1057 mail) < 0) {
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1058 ret = -1;
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1059 break;
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1060 }
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1061 }
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1062
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1063 if (++count == SEARCH_NONBLOCK_COUNT) {
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1064 *tryagain_r = TRUE;
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1065 return 0;
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1066 }
1915
79790750c349 importing new index code. mbox still broken.
Timo Sirainen <tss@iki.fi>
parents: 1845
diff changeset
1067 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1068 if (ret < 0)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1069 ctx->failed = TRUE;
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1070 ctx->mail = NULL;
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1071 ctx->imail = NULL;
1672
8920600a8cfc Index cache file rewrite. It's not finished yet and mbox support is
Timo Sirainen <tss@iki.fi>
parents: 1638
diff changeset
1072
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1073 if (ctx->mail_ctx.sort_program != NULL && ret == 0) {
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1074 /* finished searching the messages. now sort them and start
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1075 returning the messages. */
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1076 ctx->sorted = TRUE;
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1077 if (index_sort_list_finish(ctx->mail_ctx.sort_program) < 0)
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1078 return -1;
4939
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1079 return index_storage_search_next_nonblock(_ctx, mail,
ff2272c228cc Dovecot is now able to execute multiple commands at the same time.
Timo Sirainen <tss@iki.fi>
parents: 4907
diff changeset
1080 tryagain_r);
4303
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1081 }
5f03738219a6 Changed mail-storage API to do the mail sorting internally. Optimized it
Timo Sirainen <timo.sirainen@movial.fi>
parents: 4259
diff changeset
1082
3209
923ff19873d4 Major mail-storage API changes. It's now a bit cleaner and much more plugin
Timo Sirainen <tss@iki.fi>
parents: 3039
diff changeset
1083 return ret;
0
3b1985cbc908 Initial revision
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
1084 }
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1085
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1086 int index_storage_search_next_update_seq(struct mail_search_context *_ctx)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1087 {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1088 struct index_search_context *ctx = (struct index_search_context *)_ctx;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1089 int ret;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1090
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1091 if (_ctx->seq == 0) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1092 /* first time */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1093 _ctx->seq = ctx->seq1;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1094 } else {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1095 _ctx->seq++;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1096 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1097
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1098 if (!ctx->have_seqsets)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1099 return _ctx->seq <= ctx->seq2 ? 1 : 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1100
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1101 ret = 0;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1102 while (_ctx->seq <= ctx->seq2) {
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1103 /* check if the sequence matches */
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1104 ret = mail_search_args_foreach(ctx->mail_ctx.args,
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1105 search_seqset_arg, ctx);
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1106 if (ret != 0)
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1107 break;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1108
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1109 /* doesn't, try next one */
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1110 _ctx->seq++;
4607
71b3570946f8 Moved some search parameters to public struct mail_search_context and added
Timo Sirainen <tss@iki.fi>
parents: 4439
diff changeset
1111 mail_search_args_reset(ctx->mail_ctx.args, FALSE);
4196
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1112 }
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1113 return ret == 0 ? 0 : 1;
6ac0d63b297f Optimized searching a bit for cases where we can restrict search range by
Timo Sirainen <tss@iki.fi>
parents: 4062
diff changeset
1114 }