database: Rename internal directory value from XTIMESTAMP to XDIRECTORY.

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 7efd3b4ae3c1dea17833de6e1dba9f8cc9cbf536..5c49f74c998f244cf0253445e94261895b3b4e18 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -75,6 +75,9 @@ typedef struct {
  * user in searching. But the database doesn't really care itself
  * about any of these.
  *
+ * Finally, the data portion of a mail document contains the path name
+ * of the mail message (relative to the database path).
+ *
  * Directory document
  * ------------------
  * A directory document is used by a client of the notmuch library to
@@ -83,7 +86,7 @@ typedef struct {
  *
  * The directory document is indexed with a single prefixed term:
  *
- *     directory:      The directory path (an absolute path)
+ *     directory:      The directory path (relative to the database path)
  *
  * and has a single value:
  *
@@ -109,8 +112,7 @@ prefix_t BOOLEAN_PREFIX_INTERNAL[] = {
     { "type", "T" },
     { "reference", "XREFERENCE" },
     { "replyto", "XREPLYTO" },
-    /* XXX: Need a flag day to rename XTIMESTAMP. */
-    { "directory", "XTIMESTAMP" },
+    { "directory", "XDIRECTORY" },
 };
 
 prefix_t BOOLEAN_PREFIX_EXTERNAL[] = {
@@ -636,6 +638,8 @@ notmuch_database_set_directory_mtime (notmuch_database_t *notmuch,
        return NOTMUCH_STATUS_READONLY_DATABASE;
     }
 
+    path = _notmuch_database_relative_path (notmuch, path);
+
     db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
     db_path = directory_db_path (path);