debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-18 21:45:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move index_file out from main() into its own function.

Browse source 
This is a step toward having a program that will index many messages
with a single invocation.
This commit is contained in:
Carl Worth 2009-10-13 20:42:08 -07:00
parent c4812dae16
commit 3253954233
1 changed files with 92 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
notmuch-index-message.cc
View file

@ -319,16 +319,18 @@ gen_terms_body (Xapian::TermGenerator term_gen,
g_io_channel_close (channel); g_io_channel_close (channel);
} }
static void
int index_file (Xapian::WritableDatabase db,
main (int argc, char **argv) Xapian::TermGenerator term_gen,
const char *filename)
{ {
Xapian::Document doc;
GMimeStream *stream; GMimeStream *stream;
GMimeParser *parser; GMimeParser *parser;
GMimeMessage *message; GMimeMessage *message;
InternetAddressList *addresses; InternetAddressList *addresses;
const char *database_path, *filename;
FILE *file; FILE *file;
const char *value, *from; const char *value, *from;
@ -337,42 +339,22 @@ main (int argc, char **argv)
struct tm gm_time_tm; struct tm gm_time_tm;
char date_str[16]; /* YYYYMMDDHHMMSS + 1 for Y100k compatibility ;-) */ char date_str[16]; /* YYYYMMDDHHMMSS + 1 for Y100k compatibility ;-) */
if (argc < 3) {
fprintf (stderr, "Usage: %s <path-to-xapian-database> <mail-message>\n",
argv[0]);
exit (1);
}
database_path = argv[1];
filename = argv[2];
file = fopen (filename, "r"); file = fopen (filename, "r");
if (! file) { if (! file) {
fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno)); fprintf (stderr, "Error opening %s: %s\n", filename, strerror (errno));
exit (1); exit (1);
} }
g_mime_init (0);
stream = g_mime_stream_file_new (file); stream = g_mime_stream_file_new (file);
parser = g_mime_parser_new_with_stream (stream); parser = g_mime_parser_new_with_stream (stream);
message = g_mime_parser_construct_message (parser); message = g_mime_parser_construct_message (parser);
try {
Xapian::WritableDatabase db;
Xapian::TermGenerator term_gen;
Xapian::Document doc;
doc = Xapian::Document (); doc = Xapian::Document ();
doc.set_data (filename); doc.set_data (filename);
db = Xapian::WritableDatabase (database_path,
Xapian::DB_CREATE_OR_OPEN);
term_gen = Xapian::TermGenerator ();
term_gen.set_stemmer (Xapian::Stem ("english")); term_gen.set_stemmer (Xapian::Stem ("english"));
term_gen.set_document (doc); term_gen.set_document (doc);
@ -432,14 +414,42 @@ main (int argc, char **argv)
db.add_document (doc); db.add_document (doc);
g_object_unref (message);
g_object_unref (parser);
g_object_unref (stream);
}
int
main (int argc, char **argv)
{
const char *database_path, *filename;
if (argc < 3) {
fprintf (stderr, "Usage: %s <path-to-xapian-database> <mail-message>\n",
argv[0]);
exit (1);
}
database_path = argv[1];
filename = argv[2];
g_mime_init (0);
try {
Xapian::WritableDatabase db;
Xapian::TermGenerator term_gen;
db = Xapian::WritableDatabase (database_path,
Xapian::DB_CREATE_OR_OPEN);
term_gen = Xapian::TermGenerator ();
index_file (db, term_gen, filename);
} catch (const Xapian::Error &error) { } catch (const Xapian::Error &error) {
cerr << "A Xapian exception occurred: " << error.get_msg () << endl; cerr << "A Xapian exception occurred: " << error.get_msg () << endl;
exit (1); exit (1);
} }
g_object_unref (message);
g_object_unref (parser);
g_object_unref (stream);
return 0; return 0;
} }