From 5b480c4dc1a251559ed313a3a1206b462590d4ae Mon Sep 17 00:00:00 2001
From: datastore <foo@bar.org>
Date: Wed, 15 Jul 2009 15:13:42 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:versionsupport-project/mainline

---
diff --git a/datastore-redesign.html b/datastore-redesign.html
index ac973e2..4e98594 100644
--- a/datastore-redesign.html
+++ b/datastore-redesign.html
@@ -25,8 +25,12 @@
    <li>examine / define API call interactions, esp. in case we switch to fully synchronous design</li>
    <li>do we want an optimized way to determine (only) the branch HEADs of a given <code>tree_id</code>?</li>
    <li>example activity &lt;-&gt; data store interaction</li>
-   <li>Tomeu: What about having a separate call that returns synchronously a new <code>tree_id</code> and/or <code>version_id?</code></li>
-   <li>add <code>query</code> from <code>find()</code> to <code>textsearch()</code> as well?</li>
+   <li>Tomeu: What about having a separate call that returns synchronously a new <code>tree_id</code> and/or <code>version_id?</code>
+    <ul>
+     <li>need to handle missing intermediate versions in that case (parent_id set to a never-committed version)</li>
+    </li>
+   </li>
+   <li>cross-<code>tree_id</code> duplicate detection/optimization</li>
   </ul>
 
   <h2>(A)synchronicity of API calls</h2>
@@ -403,10 +407,10 @@
     </p>
    </dd>
 
-   <dt><code>textsearch(querystring, options)</code></dt>
+   <dt><code>textsearch(querystring, query, options)</code></dt>
    <dd>Preliminary API call for IR search using Xapian. Likely to be replaced for next version.
-    <code>querystring</code> is passed to Xapians query parser, <code>options</code>
-    interpreted like for <code>find()</code>. Returns the same format as <code>find()</code>.
+    <code>querystring</code> is passed to Xapians query parser; <code>query</code> and <code>options</code>
+    are interpreted like for <code>find()</code>. Returns the same format as <code>find()</code>.
    </dd>
    
    <dt><code>find_unique_values(query, metadata_name)</code></dt>
--
cgit v0.9.1