From: Carl Worth Date: Tue, 13 Oct 2009 16:36:25 +0000 (-0700) Subject: xapian-dump: Add support to unserialize values. X-Git-Tag: 0.1~891 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ea96cb694f83ca00db9516bd3cb7724fb63a7854 xapian-dump: Add support to unserialize values. The interface for this is cheesy, (bare integer value numbers on the command line indicating that unserialization is desired for those value numbers). But this at least lets us print sup databases with human-readable output for the date values. --- diff --git a/xapian-dump.cc b/xapian-dump.cc index 79a018d6..b28c274c 100644 --- a/xapian-dump.cc +++ b/xapian-dump.cc @@ -34,11 +34,14 @@ #include #include +#include #include using namespace std; +vector UNSERIALIZE; + static void print_document_terms (Xapian::Document doc) { @@ -50,15 +53,43 @@ print_document_terms (Xapian::Document doc) cout << "\t" << *i << endl; } +static int +vector_int_contains (vector v, int i) +{ + vector::iterator result; + + result = find (v.begin(), v.end(), i); + + return result != v.end(); +} + static void print_document_values (Xapian::Document doc) { Xapian::ValueIterator i; + int value_no, value_int; + double value_float; printf ("Values:\n"); - for (i = doc.values_begin (); i != doc.values_end (); i++) - cout << "\t" << i.get_valueno() << ": " << *i << endl; + for (i = doc.values_begin (); i != doc.values_end (); i++) { + value_no = i.get_valueno(); + + cout << "\t" << i.get_valueno() << ": "; + + if (vector_int_contains (UNSERIALIZE, value_no)) { + value_float = Xapian::sortable_unserialise (*i); + value_int = value_float; + if (value_int == value_float) + cout << value_int; + else + cout << value_float; + } else { + cout << *i; + } + + cout << endl; + } } static void @@ -79,15 +110,24 @@ int main (int argc, char *argv[]) { const char *database_path; + int i; if (argc < 2) { - fprintf (stderr, "Usage: %s \n", + fprintf (stderr, "Usage: %s [value_nos...]\n", argv[0]); + fprintf (stderr, "Dumps data from the given database.\n"); + fprintf (stderr, "The values corresponding to any value numbers given on the command line\n"); + fprintf (stderr, "will be unserialized to an before being printed.\n"); exit (1); } database_path = argv[1]; + UNSERIALIZE = vector (); + + for (i = 2; i < argc; i++) + UNSERIALIZE.push_back (atoi (argv[i])); + try { Xapian::Database db;