Remove improper assertion use from beagle cache handling code

src/rcldb/rcldb_p.h

@@ -0,0 +1,119 @@
+/* Copyright (C) 2007 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _rcldb_p_h_included_
+#define _rcldb_p_h_included_
+
+#include <map>
+
+#ifdef IDX_THREADS
+#include "workqueue.h"
+#endif // IDX_THREADS
+#include "xapian.h"
+#include "xmacros.h"
+
+namespace Rcl {
+
+class Query;
+
+#ifdef IDX_THREADS
+class DbUpdTask {
+public:
+    DbUpdTask(const string& ud, const string& un, const Xapian::Document &d,
+	size_t tl)
+	: udi(ud), uniterm(un), doc(d), txtlen(tl)
+    {}
+    string udi;
+    string uniterm;
+    Xapian::Document doc;
+    size_t txtlen;
+};
+#endif // IDX_THREADS
+
+// A class for data and methods that would have to expose
+// Xapian-specific stuff if they were in Rcl::Db. There could actually be
+// 2 different ones for indexing or query as there is not much in
+// common.
+class Db::Native {
+ public:
+    Db  *m_rcldb; // Parent
+    bool m_isopen;
+    bool m_iswritable;
+    bool m_noversionwrite; //Set if open failed because of version mismatch!
+#ifdef IDX_THREADS
+    WorkQueue<DbUpdTask*> m_wqueue;
+#endif // IDX_THREADS
+
+    // Indexing 
+    Xapian::WritableDatabase xwdb;
+    // Querying (active even if the wdb is too)
+    Xapian::Database xrdb;
+
+    // We sometimes go through the wdb for some query ops, don't
+    // really know if this makes sense
+    Xapian::Database& xdb() {return m_iswritable ? xwdb : xrdb;}
+
+    Native(Db *db) 
+	: m_rcldb(db), m_isopen(false), m_iswritable(false),
+          m_noversionwrite(false)
+#ifdef IDX_THREADS
+	, m_wqueue(10)
+#endif // IDX_THREADS
+    { }
+
+    ~Native() { 
+#ifdef IDX_THREADS
+	if (m_iswritable) {
+	    void *status = m_wqueue.setTerminateAndWait();
+	    LOGDEB(("Native: worker status %ld\n", long(status)));
+	}
+#endif // IDX_THREADS
+    }
+
+    double qualityTerms(Xapian::docid docid, 
+			Query *query,
+			const vector<string>& terms,
+			std::multimap<double, string>& byQ);
+    void setDbWideQTermsFreqs(Query *query);
+    vector<string> makeAbstract(Xapian::docid id, Query *query);
+    bool getPagePositions(Xapian::docid docid, vector<int>& vpos);
+    int getFirstMatchPage(Xapian::docid docid, Query *query);
+    int getPageNumberForPosition(const vector<int>& pbreaks, unsigned int pos);
+
+    bool dbDataToRclDoc(Xapian::docid docid, std::string &data, Doc &doc);
+
+    /** Compute list of subdocuments for a given udi. We look for documents 
+     * indexed by a parent term matching the udi, the posting list for the 
+     * parentterm(udi)  (As suggested by James Aylett)
+     *
+     * Note that this is not currently recursive: all subdocs are supposed 
+     * to be children of the file doc.
+     * Ie: in a mail folder, all messages, attachments, attachments of
+     * attached messages etc. must have the folder file document as
+     * parent. 
+     * Parent-child relationships are defined by the indexer (rcldb user)
+     * 
+     * The file-system indexer currently works this way (flatly), 
+     * subDocs() could be relatively easily changed to support full recursivity
+     * if needed.
+     */
+    bool subDocs(const string &udi, vector<Xapian::docid>& docids);
+
+};
+
+}
+#endif /* _rcldb_p_h_included_ */