Hiroyuki Ikezoe
ikezo****@users*****
Tue Dec 5 14:26:34 JST 2006
Index: kazehakase/src/mozilla/kz-mozembed.cpp
diff -u kazehakase/src/mozilla/kz-mozembed.cpp:1.214 kazehakase/src/mozilla/kz-mozembed.cpp:1.215
--- kazehakase/src/mozilla/kz-mozembed.cpp:1.214 Tue Dec 5 14:15:33 2006
+++ kazehakase/src/mozilla/kz-mozembed.cpp Tue Dec 5 14:26:34 2006
@@ -45,9 +45,8 @@
#endif
#include "utils.h"
-#if USE_HYPERESTRAIER
-# include "kz-search.h"
-#elif USE_RAST
+#include "kz-search.h"
+#ifdef USE_RAST
# include "rast-search.h"
#endif
@@ -1061,11 +1060,10 @@
g_io_channel_write_chars(io, "\n", 1, NULL, NULL);
g_io_channel_shutdown(io, TRUE, NULL);
g_io_channel_unref(io);
-#ifdef USE_HYPERESTRAIER
KzSearch *search = kz_search_new("hyperestraier");
if (search)
kz_search_register_document(search, filename, "UTF-8", title, contents, last_modified);
-#elif USE_RAST
+#ifdef USE_RAST
g_idle_add(rast_update_index, filename);
#endif
g_free(contents);
Index: kazehakase/src/mozilla/kz-mozhistorysearch.cpp
diff -u kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.20 kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.21
--- kazehakase/src/mozilla/kz-mozhistorysearch.cpp:1.20 Tue Dec 5 14:15:33 2006
+++ kazehakase/src/mozilla/kz-mozhistorysearch.cpp Tue Dec 5 14:26:34 2006
@@ -243,14 +243,13 @@
/* render the complete portal */
gchar *html = NULL;
-#ifdef USE_HYPERESTRAIER
KzSearch *search = kz_search_new("hyperestraier");
if (search)
{
html = kz_search_get_search_result_html(search, unescaped);
g_object_unref(search);
}
-#elif USE_RAST
+#ifdef USE_RAST
html = rast_get_search_result(unescaped);
#endif