X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=xapian-dump.cc;h=9000567c8dead965005c05effd20c3e45f415af4;hp=79a018d6de967709fea6696555bbae3fdd4ecd85;hb=1a6d88697b8a993f9f8fcb0371b978c6d4bcb4c6;hpb=76e15cf673106758e33cc9a709da74dff3b5d4af

diff --git a/xapian-dump.cc b/xapian-dump.cc
index 79a018d6..9000567c 100644
--- a/xapian-dump.cc
+++ b/xapian-dump.cc
@@ -24,21 +24,21 @@
  *
  * And for each document ID:
  *
- *	All terms
- *	All values
- *
- * Things not yet dumped include:
- *
- * Data associated with a document.
+ *	Document data
+ *	All document terms
+ *	All document values
  */
 
 #include <cstdlib>
 #include <iostream>
+#include <algorithm>
 
 #include <xapian.h>
 
 using namespace std;
 
+vector<int> UNSERIALIZE;
+
 static void
 print_document_terms (Xapian::Document doc)
 {
@@ -50,15 +50,43 @@ print_document_terms (Xapian::Document doc)
 	cout << "\t" << *i << endl;
 }
 
+static int
+vector_int_contains (vector<int> v, int i)
+{
+    vector<int>::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
@@ -70,6 +98,9 @@ print_document (Xapian::Database db, Xapian::docid id)
 
     doc = db.get_document (id);
 
+    printf ("Data:\n");
+    cout << "\t" << doc.get_data () << endl;
+
     print_document_terms (doc);
 
     print_document_values (doc);
@@ -79,15 +110,24 @@ int
 main (int argc, char *argv[])
 {
     const char *database_path;
+    int i;
 
     if (argc < 2) {
-	fprintf (stderr, "Usage: %s <path-to-xapian-database>\n",
+	fprintf (stderr, "Usage: %s <path-to-xapian-database> [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<int> ();
+
+    for (i = 2; i < argc; i++)
+	UNSERIALIZE.push_back (atoi (argv[i]));
+
     try {
 
 	Xapian::Database db;