-/* $Id: trav.c,v 1.44 2004-01-22 11:27:21 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- Index Data Aps
+/* $Id: trav.c,v 1.51 2006-05-10 08:13:22 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
#include <io.h>
#define S_ISREG(x) (x & _S_IFREG)
#define S_ISDIR(x) (x & _S_IFDIR)
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <direntz.h>
e = dir_open (rep, zh->path_reg, zh->m_follow_links);
if (!e)
return;
- yaz_log (LOG_LOG, "dir %s", rep);
+ yaz_log (YLOG_LOG, "dir %s", rep);
if (rep[rep_len-1] != '/')
rep[rep_len] = '/';
else
switch (e[i].kind)
{
case dirs_file:
- fileExtract (zh, NULL, rep, deleteFlag);
+ zebra_extract_file (zh, NULL, rep, deleteFlag);
break;
case dirs_dir:
repositoryExtractR (zh, deleteFlag, rep, level+1);
{
case dirs_file:
sprintf (tmppath, "%s%s", base, dst->path);
- fileExtract (zh, &dst->sysno, tmppath, 1);
+ zebra_extract_file (zh, &dst->sysno, tmppath, 1);
strcpy (tmppath, dst->path);
dst = dirs_read (di);
sprintf (tmppath, "%s%s", base, src);
e_src = dir_open (tmppath, zh->path_reg, zh->m_follow_links);
- yaz_log (LOG_LOG, "dir %s", tmppath);
+ yaz_log (YLOG_LOG, "dir %s", tmppath);
#if 0
if (!dst || repComp (dst->path, src, src_len))
{
if (e_src[i_src].name)
{
- yaz_log (LOG_DEBUG, "dst=%s src=%s", dst->path + src_len,
+ yaz_log (YLOG_DEBUG, "dst=%s src=%s", dst->path + src_len,
e_src[i_src].name);
sd = strcmp (dst->path + src_len, e_src[i_src].name);
}
sd = 1;
else
break;
- yaz_log (LOG_DEBUG, "trav sd=%d", sd);
+ yaz_log (YLOG_DEBUG, "trav sd=%d", sd);
if (sd == 0)
{
case dirs_file:
if (e_src[i_src].mtime > dst->mtime)
{
- if (fileExtract (zh, &dst->sysno, tmppath, 0))
+ if (zebra_extract_file (zh, &dst->sysno, tmppath, 0) == ZEBRA_OK)
{
dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
- yaz_log (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
- yaz_log (LOG_DEBUG, "new: %s", ctime (&e_src[i_src].mtime));
+ yaz_log (YLOG_DEBUG, "old: %s", ctime (&dst->mtime));
+ yaz_log (YLOG_DEBUG, "new: %s", ctime (&e_src[i_src].mtime));
}
dst = dirs_read (di);
break;
case dirs_dir:
fileUpdateR (zh, di, dst, base, src, level+1);
dst = dirs_last (di);
- yaz_log (LOG_DEBUG, "last is %s", dst ? dst->path : "null");
+ yaz_log (YLOG_DEBUG, "last is %s", dst ? dst->path : "null");
break;
default:
dst = dirs_read (di);
switch (e_src[i_src].kind)
{
case dirs_file:
- if (fileExtract (zh, &sysno, tmppath, 0))
+ if (zebra_extract_file (zh, &sysno, tmppath, 0) == ZEBRA_OK)
dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
switch (dst->kind)
{
case dirs_file:
- fileExtract (zh, &dst->sysno, tmppath, 1);
+ zebra_extract_file (zh, &dst->sysno, tmppath, 1);
dirs_del (di, dst->path);
dst = dirs_read (di);
break;
Dict dict;
struct dirs_info *di;
- if (!(dict = dict_open (zh->reg->bfs, FMATCH_DICT, 50, 0, 0)))
+ if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50, 0, 0, zh->res)))
{
- yaz_log (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
return;
}
di = dirs_open (dict, src, zh->m_flag_rw);
while ( (dst = dirs_read (di)) )
- yaz_log (LOG_LOG, "%s", dst->path);
+ yaz_log (YLOG_LOG, "%s", dst->path);
dirs_free (&di);
dict_close (dict);
}
if (ret == -1)
{
- yaz_log (LOG_WARN|LOG_ERRNO, "Cannot access path %s", src);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
}
else if (S_ISREG(sbuf.st_mode))
{
struct dirs_entry *e_dst;
- di = dirs_fopen (dict, src);
+ di = dirs_fopen (dict, src, zh->m_flag_rw);
e_dst = dirs_read (di);
if (e_dst)
{
if (sbuf.st_mtime > e_dst->mtime)
- if (fileExtract (zh, &e_dst->sysno, src, 0))
+ if (zebra_extract_file (zh, &e_dst->sysno, src, 0) == ZEBRA_OK)
dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
}
else
{
SYSNO sysno = 0;
- if (fileExtract (zh, &sysno, src, 0))
+ if (zebra_extract_file (zh, &sysno, src, 0) == ZEBRA_OK)
dirs_add (di, src, sysno, sbuf.st_mtime);
}
dirs_free (&di);
}
else
{
- yaz_log (LOG_WARN, "Skipping path %s", src);
+ yaz_log (YLOG_WARN, "Skipping path %s", src);
}
}
strcpy (src, path);
if (ret == -1)
- yaz_log (LOG_WARN|LOG_ERRNO, "Cannot access path %s", src);
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
else if (S_ISREG(sbuf.st_mode))
- fileExtract (zh, NULL, src, deleteFlag);
+ zebra_extract_file (zh, NULL, src, deleteFlag);
else if (S_ISDIR(sbuf.st_mode))
repositoryExtractR (zh, deleteFlag, src, 0);
else
- yaz_log (LOG_WARN, "Skipping path %s", src);
+ yaz_log (YLOG_WARN, "Skipping path %s", src);
}
static void repositoryExtractG (ZebraHandle zh, const char *path,
repositoryExtract (zh, deleteFlag, path);
}
+#if 0
+static int dump_file_dict_func(char *name, const char *info, int pos,
+ void *client)
+{
+ yaz_log(YLOG_LOG, "%s", name);
+ return 0;
+}
+static void dump_file_dict(Dict dict)
+{
+ int before = 10;
+ int after = 1000;
+ char term[1000];
+
+ strcpy(term, "0");
+ dict_scan (dict, term, &before, &after, 0, dump_file_dict_func);
+}
+#endif
+
void repositoryUpdate (ZebraHandle zh, const char *path)
{
assert (path);
if (zh->m_record_id && !strcmp (zh->m_record_id, "file"))
{
Dict dict;
- if (!(dict = dict_open (zh->reg->bfs, FMATCH_DICT, 50,
- zh->m_flag_rw, 0)))
+ if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50,
+ zh->m_flag_rw, 0, zh->res)))
{
- yaz_log (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
return ;
}
if (!strcmp(path, "") || !strcmp(path, "-"))
}
else
fileUpdate (zh, dict, path);
+#if 0
+ dump_file_dict(dict);
+#endif
dict_close (dict);
+
}
else
repositoryExtractG (zh, path, 0);
repositoryExtractG (zh, path, 1);
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+