Hiroyuki Ikezoe
ikezo****@users*****
Sun Dec 3 11:17:41 JST 2006
Index: kazehakase/src/mozilla/kz-mozembed.cpp
diff -u kazehakase/src/mozilla/kz-mozembed.cpp:1.208 kazehakase/src/mozilla/kz-mozembed.cpp:1.209
--- kazehakase/src/mozilla/kz-mozembed.cpp:1.208 Sat Dec 2 21:47:08 2006
+++ kazehakase/src/mozilla/kz-mozembed.cpp Sun Dec 3 11:17:40 2006
@@ -46,7 +46,7 @@
#include "utils.h"
#if USE_HYPERESTRAIER
-# include "estsearch.h"
+# include "kz-search.h"
#elif USE_RAST
# include "rast-search.h"
#endif
@@ -1049,7 +1049,9 @@
g_io_channel_shutdown(io, TRUE, NULL);
g_io_channel_unref(io);
#if USE_HYPERESTRAIER
- g_idle_add(estsearch_update_index, filename);
+ KzSearch *search = kz_search_get_instance("est");
+ if (search)
+ kz_search_register_document(search, filename);
#elif USE_RAST
g_idle_add(rast_update_index, filename);
#endif
Index: kazehakase/src/mozilla/kz-mozhistorysearch.cpp
diff -u kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.16 kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.17
--- kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.16 Thu Feb 23 22:30:57 2006
+++ kazehakase/src/mozilla/kz-mozhistorysearch.cpp Sun Dec 3 11:17:40 2006
@@ -245,7 +245,12 @@
/* render the complete portal */
gchar *html = NULL;
#if USE_HYPERESTRAIER
- html = estsearch_get_search_result(unescaped);
+ KzSearch *search = kz_search_get_instance("est");
+ if (search)
+ {
+ html = kz_search_get_search_result_html(search, unescaped);
+ g_object_unref(search);
+ }
#elif USE_RAST
html = rast_get_search_result(unescaped);
#endif