svnno****@sourc*****
svnno****@sourc*****
Mon Mar 26 11:19:03 JST 2007
Revision: 3010
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3010
Author: kous
Date: 2007-03-26 11:19:03 +0900 (Mon, 26 Mar 2007)
Log Message:
-----------
* src/utils/utils.c (purge_history_file_by_time_stamp):
converted to real URI instead of file:// URI.
* src/kz-app.c, src/utils/utils.[ch]
(purge_history_file_by_time_stamp): added history_dir to arguments.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/kz-app.c
kazehakase/trunk/src/utils/utils.c
kazehakase/trunk/src/utils/utils.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-26 01:55:50 UTC (rev 3009)
+++ kazehakase/trunk/ChangeLog 2007-03-26 02:19:03 UTC (rev 3010)
@@ -1,5 +1,10 @@
2007-03-26 Kouhei Sutou <kou****@cozmi*****>
+ * src/utils/utils.c (purge_history_file_by_time_stamp):
+ converted to real URI instead of file:// URI.
+ * src/kz-app.c, src/utils/utils.[ch]
+ (purge_history_file_by_time_stamp): added history_dir to arguments.
+
* module/search/kz-hyper-estraier-search.c (unregister_document):
used ESTDBWRITER instead of ESTDBREADER.
Modified: kazehakase/trunk/src/kz-app.c
===================================================================
--- kazehakase/trunk/src/kz-app.c 2007-03-26 01:55:50 UTC (rev 3009)
+++ kazehakase/trunk/src/kz-app.c 2007-03-26 02:19:03 UTC (rev 3010)
@@ -364,7 +364,8 @@
NULL);
if (!g_file_test(history_time_stamp, G_FILE_TEST_EXISTS))
make_history_time_stamp(history_dir, history_time_stamp);
- purge_history_file_by_time_stamp(history_time_stamp,
+ purge_history_file_by_time_stamp(history_dir,
+ history_time_stamp,
limit_seconds);
g_free(history_dir);
g_free(history_time_stamp);
Modified: kazehakase/trunk/src/utils/utils.c
===================================================================
--- kazehakase/trunk/src/utils/utils.c 2007-03-26 01:55:50 UTC (rev 3009)
+++ kazehakase/trunk/src/utils/utils.c 2007-03-26 02:19:03 UTC (rev 3010)
@@ -628,12 +628,13 @@
}
void
-purge_history_file_by_time_stamp(const gchar *time_stamp_path,
+purge_history_file_by_time_stamp(const gchar *history_dir,
+ const gchar *time_stamp_path,
time_t limit_seconds)
{
gchar buf[BUFFER_SIZE];
gchar *tmp_file;
- gint fd;
+ gint fd, history_dir_len;
FILE *fp;
GTimeVal now;
time_t t;
@@ -654,6 +655,7 @@
search = KZ_GET_SEARCH;
g_get_current_time(&now);
t = now.tv_sec;
+ history_dir_len = strlen(history_dir);
while (fgets(buf, sizeof(buf), fp))
{
gchar *pos;
@@ -674,12 +676,15 @@
g_stat(path, &st) == 0 &&
t - st.st_mtime > limit_seconds)
{
- if (search)
+ if (search && strlen(path) > history_dir_len)
{
- gchar *filename;
- filename = g_strdup_printf("file://%s", path);
- kz_search_unregister_document(search, filename);
- g_free(filename);
+ gchar *uri;
+ gchar *relative_path;
+
+ relative_path = path + history_dir_len;
+ uri = create_uri_from_filename(relative_path);
+ kz_search_unregister_document(search, uri);
+ g_free(uri);
}
/* remove file over storage period */
g_unlink(path);
Modified: kazehakase/trunk/src/utils/utils.h
===================================================================
--- kazehakase/trunk/src/utils/utils.h 2007-03-26 01:55:50 UTC (rev 3009)
+++ kazehakase/trunk/src/utils/utils.h 2007-03-26 02:19:03 UTC (rev 3010)
@@ -59,7 +59,8 @@
const gchar *time_stamp_path);
void purge_history_file (const gchar *path,
time_t limit_seconds);
-void purge_history_file_by_time_stamp (const gchar *time_stamp_path,
+void purge_history_file_by_time_stamp (const gchar *history_dir,
+ const gchar *time_stamp_path,
time_t limit_seconds);
void convert_image (const gchar *ps_file,
const gchar *png_file);