-/* $Id: trav.c,v 1.42 2003-03-25 19:56:01 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: trav.c,v 1.47 2005-01-15 19:38:27 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
}
static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
- struct recordGroup *rGroup,
int level)
{
struct dir_entry *e;
int i;
size_t rep_len = strlen (rep);
- e = dir_open (rep, zh->path_reg, rGroup->followLinks);
+ e = dir_open (rep, zh->path_reg, zh->m_follow_links);
if (!e)
return;
- logf (LOG_LOG, "dir %s", rep);
+ yaz_log (YLOG_LOG, "dir %s", rep);
if (rep[rep_len-1] != '/')
rep[rep_len] = '/';
else
strcpy (rep +rep_len+1, e[i].name);
if ((ecp = strrchr (e[i].name, '/')))
*ecp = '\0';
- if (level == 0 && rGroup->databaseNamePath)
- rGroup->databaseName = e[i].name;
switch (e[i].kind)
{
case dirs_file:
- fileExtract (zh, NULL, rep, rGroup, deleteFlag);
+ fileExtract (zh, NULL, rep, deleteFlag);
break;
case dirs_dir:
- repositoryExtractR (zh, deleteFlag, rep, rGroup, level+1);
+ repositoryExtractR (zh, deleteFlag, rep, level+1);
break;
}
}
static void fileDeleteR (ZebraHandle zh,
struct dirs_info *di, struct dirs_entry *dst,
- const char *base, char *src,
- struct recordGroup *rGroup)
+ const char *base, char *src)
{
char tmppath[1024];
size_t src_len = strlen (src);
{
case dirs_file:
sprintf (tmppath, "%s%s", base, dst->path);
- fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
+ fileExtract (zh, &dst->sysno, tmppath, 1);
strcpy (tmppath, dst->path);
dst = dirs_read (di);
static void fileUpdateR (ZebraHandle zh,
struct dirs_info *di, struct dirs_entry *dst,
const char *base, char *src,
- struct recordGroup *rGroup,
int level)
{
struct dir_entry *e_src;
size_t src_len = strlen (src);
sprintf (tmppath, "%s%s", base, src);
- e_src = dir_open (tmppath, zh->path_reg, rGroup->followLinks);
- logf (LOG_LOG, "dir %s", tmppath);
+ e_src = dir_open (tmppath, zh->path_reg, zh->m_follow_links);
+ yaz_log (YLOG_LOG, "dir %s", tmppath);
#if 0
if (!dst || repComp (dst->path, src, src_len))
else if (!e_src)
{
strcpy (src, dst->path);
- fileDeleteR (zh, di, dst, base, src, rGroup);
+ fileDeleteR (zh, di, dst, base, src);
return;
}
else
{
if (e_src[i_src].name)
{
- logf (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;
- logf (LOG_DEBUG, "trav sd=%d", sd);
+ yaz_log (YLOG_DEBUG, "trav sd=%d", sd);
- if (level == 0 && rGroup->databaseNamePath)
- rGroup->databaseName = e_src[i_src].name;
if (sd == 0)
{
strcpy (src + src_len, e_src[i_src].name);
case dirs_file:
if (e_src[i_src].mtime > dst->mtime)
{
- if (fileExtract (zh, &dst->sysno, tmppath, rGroup, 0))
+ if (fileExtract (zh, &dst->sysno, tmppath, 0))
{
dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
- logf (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
- logf (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, rGroup, level+1);
+ fileUpdateR (zh, di, dst, base, src, level+1);
dst = dirs_last (di);
- logf (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, rGroup, 0))
+ if (fileExtract (zh, &sysno, tmppath, 0))
dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
- fileUpdateR (zh, di, dst, base, src, rGroup, level+1);
+ fileUpdateR (zh, di, dst, base, src, level+1);
if (dst)
dst = dirs_last (di);
break;
switch (dst->kind)
{
case dirs_file:
- fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
+ fileExtract (zh, &dst->sysno, tmppath, 1);
dirs_del (di, dst->path);
dst = dirs_read (di);
break;
case dirs_dir:
- fileDeleteR (zh, di, dst, base, src, rGroup);
+ fileDeleteR (zh, di, dst, base, src);
dst = dirs_last (di);
}
}
dir_free (&e_src);
}
-static void groupRes (ZebraHandle zh, struct recordGroup *rGroup)
+void repositoryShow (ZebraHandle zh, const char *path)
{
- char resStr[256];
- char gPrefix[256];
-
- if (!rGroup->groupName || !*rGroup->groupName)
- *gPrefix = '\0';
- else
- sprintf (gPrefix, "%s.", rGroup->groupName);
-
- sprintf (resStr, "%srecordId", gPrefix);
- rGroup->recordId = res_get (zh->res, resStr);
- sprintf (resStr, "%sdatabasePath", gPrefix);
- rGroup->databaseNamePath =
- atoi (res_get_def (zh->res, resStr, "0"));
-
- rGroup->databaseNamePath =
- atoi (res_get_def (zh->res, resStr, "0"));
-
- if (rGroup->followLinks == -1)
- {
- sprintf (resStr, "%sfollowLinks", gPrefix);
- rGroup->followLinks =
- atoi (res_get_def (zh->res, resStr, "1"));
- }
-}
-
-void repositoryShow (ZebraHandle zh)
-
-{
- struct recordGroup *rGroup = &zh->rGroup;
char src[1024];
int src_len;
struct dirs_entry *dst;
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)))
{
- logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
return;
}
- assert (rGroup->path);
- strcpy (src, rGroup->path);
+ strncpy(src, path, sizeof(src)-1);
+ src[sizeof(src)-1]='\0';
src_len = strlen (src);
if (src_len && src[src_len-1] != '/')
src[++src_len] = '\0';
}
- di = dirs_open (dict, src, rGroup->flagRw);
+ di = dirs_open (dict, src, zh->m_flag_rw);
while ( (dst = dirs_read (di)) )
- logf (LOG_LOG, "%s", dst->path);
+ yaz_log (YLOG_LOG, "%s", dst->path);
dirs_free (&di);
dict_close (dict);
}
-static void fileUpdate (ZebraHandle zh,
- Dict dict, struct recordGroup *rGroup,
- const char *path)
+static void fileUpdate (ZebraHandle zh, Dict dict, const char *path)
{
struct dirs_info *di;
struct stat sbuf;
char src[1024];
char dst[1024];
- int src_len;
+ int src_len, ret;
assert (path);
else
*src = '\0';
strcat (src, path);
- zebra_file_stat (src, &sbuf, rGroup->followLinks);
+ ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
strcpy (src, path);
src_len = strlen (src);
- if (S_ISREG(sbuf.st_mode))
+ if (ret == -1)
+ {
+ 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);
if (e_dst)
{
if (sbuf.st_mtime > e_dst->mtime)
- if (fileExtract (zh, &e_dst->sysno, src, rGroup, 0))
+ if (fileExtract (zh, &e_dst->sysno, src, 0))
dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
}
else
{
SYSNO sysno = 0;
- if (fileExtract (zh, &sysno, src, rGroup, 0))
+ if (fileExtract (zh, &sysno, src, 0))
dirs_add (di, src, sysno, sbuf.st_mtime);
}
dirs_free (&di);
src[src_len] = '/';
src[++src_len] = '\0';
}
- di = dirs_open (dict, src, rGroup->flagRw);
+ di = dirs_open (dict, src, zh->m_flag_rw);
*dst = '\0';
- fileUpdateR (zh, di, dirs_read (di), src, dst, rGroup, 0);
+ fileUpdateR (zh, di, dirs_read (di), src, dst, 0);
dirs_free (&di);
}
else
{
- logf (LOG_WARN, "Ignoring path %s", src);
+ yaz_log (YLOG_WARN, "Skipping path %s", src);
}
}
-
static void repositoryExtract (ZebraHandle zh,
- int deleteFlag, struct recordGroup *rGroup,
- const char *path)
+ int deleteFlag, const char *path)
{
struct stat sbuf;
char src[1024];
+ int ret;
assert (path);
else
*src = '\0';
strcat (src, path);
- zebra_file_stat (src, &sbuf, rGroup->followLinks);
+ ret = zebra_file_stat (src, &sbuf, zh->m_follow_links);
strcpy (src, path);
- if (S_ISREG(sbuf.st_mode))
- fileExtract (zh, NULL, src, rGroup, deleteFlag);
+ if (ret == -1)
+ yaz_log (YLOG_WARN|YLOG_ERRNO, "Cannot access path %s", src);
+ else if (S_ISREG(sbuf.st_mode))
+ fileExtract (zh, NULL, src, deleteFlag);
else if (S_ISDIR(sbuf.st_mode))
- repositoryExtractR (zh, deleteFlag, src, rGroup, 0);
+ repositoryExtractR (zh, deleteFlag, src, 0);
else
- logf (LOG_WARN, "Ignoring path %s", src);
+ yaz_log (YLOG_WARN, "Skipping path %s", src);
}
-static void repositoryExtractG (ZebraHandle zh,
- int deleteFlag, struct recordGroup *rGroup)
+static void repositoryExtractG (ZebraHandle zh, const char *path,
+ int deleteFlag)
{
- if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ if (!strcmp(path, "") || !strcmp(path, "-"))
{
char src[1024];
-
+
while (scanf ("%1020s", src) == 1)
- repositoryExtract (zh, deleteFlag, rGroup, src);
+ repositoryExtract (zh, deleteFlag, src);
}
else
- repositoryExtract (zh, deleteFlag, rGroup, rGroup->path);
+ repositoryExtract (zh, deleteFlag, path);
}
-void repositoryUpdate (ZebraHandle zh)
+void repositoryUpdate (ZebraHandle zh, const char *path)
{
- struct recordGroup *rGroup = &zh->rGroup;
- groupRes (zh, rGroup);
- assert (rGroup->path);
- if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+ 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,
- rGroup->flagRw, 0)))
+ if (!(dict = dict_open_res (zh->reg->bfs, FMATCH_DICT, 50,
+ zh->m_flag_rw, 0, zh->res)))
{
- logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ yaz_log (YLOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
return ;
}
- if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ if (!strcmp(path, "") || !strcmp(path, "-"))
{
char src[1024];
while (scanf ("%s", src) == 1)
- fileUpdate (zh, dict, rGroup, src);
+ fileUpdate (zh, dict, src);
}
else
- fileUpdate (zh, dict, rGroup, rGroup->path);
+ fileUpdate (zh, dict, path);
dict_close (dict);
}
else
- repositoryExtractG (zh, 0, rGroup);
+ repositoryExtractG (zh, path, 0);
}
-void repositoryDelete (ZebraHandle zh)
+void repositoryDelete (ZebraHandle zh, const char *path)
{
- struct recordGroup *rGroup = &zh->rGroup;
- groupRes (zh, rGroup);
- assert (rGroup->path);
- repositoryExtractG (zh, 1, rGroup);
+ assert (path);
+ repositoryExtractG (zh, path, 1);
}
projects / idzebra-moved-to-github.git / blobdiff