Hiroyuki Ikezoe
ikezo****@users*****
Wed Dec 6 14:10:28 JST 2006
Index: kazehakase/module/search/kz-search-hyper-estraier.c
diff -u kazehakase/module/search/kz-search-hyper-estraier.c:1.15 kazehakase/module/search/kz-search-hyper-estraier.c:1.16
--- kazehakase/module/search/kz-search-hyper-estraier.c:1.15 Wed Dec 6 11:25:23 2006
+++ kazehakase/module/search/kz-search-hyper-estraier.c Wed Dec 6 14:10:28 2006
@@ -20,9 +20,10 @@
#include <ctype.h>
#include <glib/gi18n.h>
-#include <estraier.h>
#include <glib.h>
#include <glib/gstdio.h>
+#include <estraier.h>
+#include <estmtdb.h>
#include "kazehakase.h"
#include "utils/utils.h"
@@ -58,7 +59,7 @@
typedef struct _KzSearchHyperEstraierPrivate KzSearchHyperEstraierPrivate;
struct _KzSearchHyperEstraierPrivate
{
- ESTDB *db;
+ ESTMTDB *db;
gchar *dbname;
gchar *cache_path;
size_t cache_path_len;
@@ -219,7 +220,7 @@
if (priv->db)
{
int ecode, ret;
- ret = est_db_close(priv->db, &ecode);
+ ret = est_mtdb_close(priv->db, &ecode);
if (!ret)
g_warning("db close error: %s", est_err_msg(ecode));
}
@@ -246,7 +247,7 @@
static gchar *
create_search_result_html (KzSearch *search, const gchar *text)
{
- ESTDB *db;
+ ESTMTDB *db;
ESTCOND *cond;
CBLIST *highlights;
int ecode, *results, n_results, i, ret;
@@ -256,7 +257,7 @@
gint num_summary = 128, max_results = 20, half_of_summary;
KzSearchHyperEstraierPrivate *priv = KZ_SEARCH_HYPER_ESTRAIER_GET_PRIVATE(search);
- db = est_db_open(priv->dbname, ESTDBREADER, &ecode);
+ db = est_mtdb_open(priv->dbname, ESTDBREADER, &ecode);
if (!db)
{
g_warning("db open error: %s", est_err_msg(ecode));
@@ -296,7 +297,7 @@
KZ_CONF_GET("History", "max_results", max_results, INT);
half_of_summary = num_summary / 2;
- results = est_db_search(db, cond, &n_results, NULL);
+ results = est_mtdb_search(db, cond, &n_results, NULL);
html = g_string_sized_new(0);
@@ -315,7 +316,7 @@
gchar *desc;
const gchar *cache_link, *thumb_uri, *thumb_filename;
- doc = est_db_get_doc(db, results[i], 0);
+ doc = est_mtdb_get_doc(db, results[i], 0);
if (!doc)
continue;
@@ -348,7 +349,7 @@
cblistclose(highlights);
est_cond_delete(cond);
- ret = est_db_close(db, &ecode);
+ ret = est_mtdb_close(db, &ecode);
if (!ret)
g_warning("db close error: %s", est_err_msg(ecode));
@@ -409,14 +410,14 @@
gboolean
register_document (KzSearch *search, const gchar *uri, const gchar *title, const gchar *contents, GTime mtime)
{
- ESTDB *db;
+ ESTMTDB *db;
ESTDOC *doc;
int ret, ecode, success;
gchar *time_str, *filename, *text = NULL;
gchar *tmp_filename, *tmp_path;
KzSearchHyperEstraierPrivate *priv = KZ_SEARCH_HYPER_ESTRAIER_GET_PRIVATE(search);
- db = est_db_open(priv->dbname, ESTDBWRITER | ESTDBCREAT, &ecode);
+ db = est_mtdb_open(priv->dbname, ESTDBWRITER | ESTDBCREAT, &ecode);
if (!db)
{
g_warning("db open error: %s", est_err_msg(ecode));
@@ -447,13 +448,13 @@
g_free(text);
}
- success = est_db_put_doc(db, doc, ESTPDCLEAN);
+ success = est_mtdb_put_doc(db, doc, ESTPDCLEAN);
if (!success)
g_warning("register error: %s", est_err_msg(ecode));
est_doc_delete(doc);
- ret = est_db_close(db, &ecode);
+ ret = est_mtdb_close(db, &ecode);
if (!ret)
g_warning("db close error: %s", est_err_msg(ecode));
@@ -463,23 +464,23 @@
gboolean
unregister_document (KzSearch *search, const gchar *uri)
{
- ESTDB *db;
+ ESTMTDB *db;
int id, ret, ecode, success;
KzSearchHyperEstraierPrivate *priv = KZ_SEARCH_HYPER_ESTRAIER_GET_PRIVATE(search);
- db = est_db_open(priv->dbname, ESTDBREADER, &ecode);
+ db = est_mtdb_open(priv->dbname, ESTDBREADER, &ecode);
if (!db)
{
g_warning("error: %s", est_err_msg(ecode));
return FALSE;
}
- id = est_db_uri_to_id(db, uri);
+ id = est_mtdb_uri_to_id(db, uri);
if (id == -1)
return FALSE;
- success = est_db_out_doc(db, id, ESTODCLEAN);
+ success = est_mtdb_out_doc(db, id, ESTODCLEAN);
- ret = est_db_close(db, &ecode);
+ ret = est_mtdb_close(db, &ecode);
if (!ret)
g_warning("error: %s", est_err_msg(ecode));
@@ -489,20 +490,20 @@
static GPid
optimize_index (KzSearch *search)
{
- ESTDB *db;
+ ESTMTDB *db;
int ret, ecode;
KzSearchHyperEstraierPrivate *priv = KZ_SEARCH_HYPER_ESTRAIER_GET_PRIVATE(search);
- db = est_db_open(priv->dbname, ESTDBREADER, &ecode);
+ db = est_mtdb_open(priv->dbname, ESTDBREADER, &ecode);
if (!db)
{
g_warning("error: %s", est_err_msg(ecode));
return FALSE;
}
- est_db_optimize(db, 0);
+ est_mtdb_optimize(db, 0);
- ret = est_db_close(db, &ecode);
+ ret = est_mtdb_close(db, &ecode);
if (!ret)
g_warning("error: %s", est_err_msg(ecode));
#warning FIXME! return GSource or something.