Hiroyuki Ikezoe
ikezo****@users*****
Mon Dec 4 11:19:18 JST 2006
Index: kazehakase/src/kz-search.c
diff -u kazehakase/src/kz-search.c:1.5 kazehakase/src/kz-search.c:1.6
--- kazehakase/src/kz-search.c:1.5 Sun Dec 3 19:59:07 2006
+++ kazehakase/src/kz-search.c Mon Dec 4 11:19:18 2006
@@ -252,7 +252,7 @@
}
gboolean
-kz_search_register_document (KzSearch *search, const gchar *uri, const gchar *title, GTime mtime)
+kz_search_register_document (KzSearch *search, const gchar *uri, const gchar *encoding, const gchar *title, const gchar *contents, GTime mtime)
{
KzSearchClass *klass;
@@ -260,7 +260,7 @@
klass = KZ_SEARCH_GET_CLASS (search);
if (klass->register_document)
- return klass->register_document (search, uri, title, mtime);
+ return klass->register_document (search, uri, encoding, title, contents, mtime);
else
return FALSE;
}
Index: kazehakase/src/kz-search.h
diff -u kazehakase/src/kz-search.h:1.4 kazehakase/src/kz-search.h:1.5
--- kazehakase/src/kz-search.h:1.4 Sun Dec 3 19:59:07 2006
+++ kazehakase/src/kz-search.h Mon Dec 4 11:19:18 2006
@@ -47,7 +47,12 @@
gchar *(*get_search_result_html) (KzSearch *search, const gchar *text);
KzBookmark *(*get_search_result_bookmark) (KzSearch *search, const gchar *text);
- gboolean (*register_document) (KzSearch *search, const gchar *uri, const gchar *title, GTime mtime);
+ gboolean (*register_document) (KzSearch *search,
+ const gchar *uri,
+ const gchar *encoding,
+ const gchar *title,
+ const gchar *contents,
+ GTime mtime);
gboolean (*unregister_document) (KzSearch *search, const gchar *uri);
gboolean (*update_index) (KzSearch *search);
gboolean (*purge_index) (KzSearch *search);
@@ -63,7 +68,12 @@
gchar *kz_search_get_search_result_html (KzSearch *search, const gchar *text);
KzBookmark *kz_search_get_search_result_bookmark (KzSearch *search, const gchar *text);
-gboolean kz_search_register_document (KzSearch *search, const gchar *uri, const gchar *title, GTime mtime);
+gboolean kz_search_register_document (KzSearch *search,
+ const gchar *uri,
+ const gchar *encoding,
+ const gchar *title,
+ const gchar *contents,
+ GTime mtime);
gboolean kz_search_unregister_document (KzSearch *search, const gchar *uri);
gboolean kz_search_update_index (KzSearch *search);
gboolean kz_search_purge_index (KzSearch *search);
Index: kazehakase/src/main.c
diff -u kazehakase/src/main.c:1.118 kazehakase/src/main.c:1.119
--- kazehakase/src/main.c:1.118 Sun Dec 3 19:24:14 2006
+++ kazehakase/src/main.c Mon Dec 4 11:19:18 2006
@@ -594,7 +594,7 @@
KZ_CONF_GET("History", "store_cache", use_history_search, BOOL);
if (use_history_search)
{
-#if USE_HYPERESTRAIER
+#ifdef USE_HYPERESTRAIER
KzSearch *search = kz_search_new("hyperestraier");
search_command = g_find_program_in_path("estcmd");
exists_index = kz_search_exist_index_dir(search);
@@ -606,14 +606,14 @@
{
exists_search_cmd = TRUE;
if (!exists_index)
-#if USE_HYPERESTRAIER
+#ifdef USE_HYPERESTRAIER
kz_search_make_index(search);
#elif USE_RAST
rast_make_index();
#endif
g_free(search_command);
}
-#if USE_HYPERESTRAIER
+#ifdef USE_HYPERESTRAIER
if (search)
g_object_unref(search);
#endif