/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: trav.c,v $
- * Revision 1.21 1996-03-22 15:34:18 quinn
+ * Revision 1.37 2002-02-20 17:30:01 adam
+ * Work on new API. Locking system re-implemented
+ *
+ * Revision 1.36 1999/05/15 14:36:38 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.35 1999/02/02 14:51:09 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.34 1998/06/08 14:43:14 adam
+ * Added suport for EXPLAIN Proxy servers - added settings databasePath
+ * and explainDatabase to facilitate this. Increased maximum number
+ * of databases and attributes in one register.
+ *
+ * Revision 1.33 1998/01/12 15:04:08 adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.32 1997/09/25 14:56:51 adam
+ * Windows NT interface code to the stat call.
+ *
+ * Revision 1.31 1997/09/17 12:19:17 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.30 1997/09/09 13:38:09 adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.29 1997/02/12 20:39:47 adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.28 1996/11/01 08:58:44 adam
+ * Interface to isamc system now includes update and delete.
+ *
+ * Revision 1.27 1996/10/29 14:06:56 adam
+ * Include zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.26 1996/06/04 10:19:01 adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.25 1996/05/01 13:46:37 adam
+ * First work on multiple records in one file.
+ * New option, -offset, to the "unread" command in the filter module.
+ *
+ * Revision 1.24 1996/04/26 10:00:23 adam
+ * Added option -V to zebraidx to display version information.
+ * Removed stupid warnings from file update.
+ *
+ * Revision 1.23 1996/04/12 07:02:25 adam
+ * File update of single files.
+ *
+ * Revision 1.22 1996/04/09 06:50:50 adam
+ * Bug fix: bad reference in function fileUpdateR.
+ *
+ * Revision 1.21 1996/03/22 15:34:18 quinn
* Fixed bad reference
*
* Revision 1.20 1996/03/21 14:50:10 adam
* Split of work into more files.
*
*/
+
+
#include <stdio.h>
#include <assert.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <sys/stat.h>
#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef WIN32
+#include <io.h>
+#define S_ISREG(x) (x & _S_IFREG)
+#define S_ISDIR(x) (x & _S_IFDIR)
+#else
+#include <unistd.h>
+#endif
+#include <direntz.h>
#include <fcntl.h>
-#include <ctype.h>
#include <time.h>
-#include <alexutil.h>
#include "index.h"
+#include "zserver.h"
static int repComp (const char *a, const char *b, size_t len)
{
return memcmp (a, b, len);
}
-static void repositoryExtractR (int deleteFlag, char *rep,
- struct recordGroup *rGroup)
+static void repositoryExtractR (ZebraHandle zh, int deleteFlag, char *rep,
+ struct recordGroup *rGroup,
+ int level)
{
struct dir_entry *e;
int i;
e = dir_open (rep);
if (!e)
return;
- logf (LOG_LOG, "Dir: %s", rep);
+ logf (LOG_LOG, "dir %s", rep);
if (rep[rep_len-1] != '/')
rep[rep_len] = '/';
else
--rep_len;
+
for (i=0; e[i].name; i++)
{
+ char *ecp;
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 (NULL, rep, rGroup, deleteFlag);
+ fileExtract (zh, NULL, rep, rGroup, deleteFlag);
break;
case dirs_dir:
- repositoryExtractR (deleteFlag, rep, rGroup);
+ repositoryExtractR (zh, deleteFlag, rep, rGroup, level+1);
break;
}
}
}
-static void stdinExtractR (int deleteFlag, struct recordGroup *rGroup)
-{
- char tmppath[1024];
-
- logf (LOG_LOG, "stdinExtractR");
- while (scanf ("%s", tmppath) == 1)
- fileExtract (NULL, tmppath, rGroup, deleteFlag);
-}
-
-static void fileDeleteR (struct dirs_info *di, struct dirs_entry *dst,
- const char *base, char *src,
- struct recordGroup *rGroup)
+static void fileDeleteR (ZebraHandle zh,
+ struct dirs_info *di, struct dirs_entry *dst,
+ const char *base, char *src,
+ struct recordGroup *rGroup)
{
char tmppath[1024];
size_t src_len = strlen (src);
{
case dirs_file:
sprintf (tmppath, "%s%s", base, dst->path);
- fileExtract (&dst->sysno, tmppath, rGroup, 1);
+ fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
strcpy (tmppath, dst->path);
dst = dirs_read (di);
}
}
-static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst,
- const char *base, char *src,
- struct recordGroup *rGroup)
+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;
int i_src = 0;
sprintf (tmppath, "%s%s", base, src);
e_src = dir_open (tmppath);
- logf (LOG_LOG, "Dir: %s", tmppath);
+ logf (LOG_LOG, "dir %s", tmppath);
#if 0
if (!dst || repComp (dst->path, src, src_len))
src[++src_len] = '\0';
}
dirs_mkdir (di, src, 0);
- if (repComp (dst->path, src, src_len))
+ if (dst && repComp (dst->path, src, src_len))
dst = NULL;
}
else if (!e_src)
{
strcpy (src, dst->path);
- fileDeleteR (di, dst, base, src, rGroup);
+ fileDeleteR (zh, di, dst, base, src, rGroup);
return;
}
else
else
break;
logf (LOG_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 (&dst->sysno, tmppath, rGroup, 0))
+ if (fileExtract (zh, &dst->sysno, tmppath, rGroup, 0))
{
dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
- logf (LOG_LOG, "old: %s", ctime (&dst->mtime));
- logf (LOG_LOG, "new: %s", ctime (&e_src[i_src].mtime));
+ logf (LOG_DEBUG, "old: %s", ctime (&dst->mtime));
+ logf (LOG_DEBUG, "new: %s", ctime (&e_src[i_src].mtime));
}
dst = dirs_read (di);
break;
case dirs_dir:
- fileUpdateR (di, dst, base, src, rGroup);
+ fileUpdateR (zh, di, dst, base, src, rGroup, level+1);
dst = dirs_last (di);
logf (LOG_DEBUG, "last is %s", dst ? dst->path : "null");
break;
switch (e_src[i_src].kind)
{
case dirs_file:
- if (fileExtract (&sysno, tmppath, rGroup, 0))
+ if (fileExtract (zh, &sysno, tmppath, rGroup, 0))
dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
- fileUpdateR (di, dst, base, src, rGroup);
+ fileUpdateR (zh, di, dst, base, src, rGroup, level+1);
if (dst)
dst = dirs_last (di);
break;
switch (dst->kind)
{
case dirs_file:
- fileExtract (&dst->sysno, tmppath, rGroup, 1);
+ fileExtract (zh, &dst->sysno, tmppath, rGroup, 1);
dirs_del (di, dst->path);
dst = dirs_read (di);
break;
case dirs_dir:
- fileDeleteR (di, dst, base, src, rGroup);
+ fileDeleteR (zh, di, dst, base, src, rGroup);
dst = dirs_last (di);
}
}
dir_free (&e_src);
}
-static void groupRes (struct recordGroup *rGroup)
+static void groupRes (ZebraService zs, struct recordGroup *rGroup)
{
char resStr[256];
char gPrefix[256];
sprintf (gPrefix, "%s.", rGroup->groupName);
sprintf (resStr, "%srecordId", gPrefix);
- rGroup->recordId = res_get (common_resource, resStr);
+ rGroup->recordId = res_get (zs->res, resStr);
+ sprintf (resStr, "%sdatabasePath", gPrefix);
+ rGroup->databaseNamePath =
+ atoi (res_get_def (zs->res, resStr, "0"));
}
-
-void repositoryShow (struct recordGroup *rGroup)
+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 (FMATCH_DICT, 50, 1)))
+ if (!(dict = dict_open (zh->service->bfs, FMATCH_DICT, 50, 0, 0)))
{
logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
- exit (1);
+ return;
}
assert (rGroup->path);
src[++src_len] = '\0';
}
- di = dirs_open (dict, src);
+ di = dirs_open (dict, src, rGroup->flagRw);
while ( (dst = dirs_read (di)) )
logf (LOG_LOG, "%s", dst->path);
dict_close (dict);
}
-void repositoryUpdate (struct recordGroup *rGroup)
+static void fileUpdate (ZebraHandle zh,
+ Dict dict, struct recordGroup *rGroup,
+ const char *path)
{
+ struct dirs_info *di;
+ struct stat sbuf;
char src[1024];
char dst[1024];
int src_len;
- groupRes (rGroup);
- if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+ assert (path);
+ strcpy (src, path);
+ src_len = strlen (src);
+
+ stat (src, &sbuf);
+ if (S_ISREG(sbuf.st_mode))
{
- Dict dict;
- struct dirs_info *di;
+ struct dirs_entry *e_dst;
+ di = dirs_fopen (dict, src);
- if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+ e_dst = dirs_read (di);
+ if (e_dst)
{
- logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
- exit (1);
+ if (sbuf.st_mtime > e_dst->mtime)
+ if (fileExtract (zh, &e_dst->sysno, src, rGroup, 0))
+ dirs_add (di, src, e_dst->sysno, sbuf.st_mtime);
}
- assert (rGroup->path);
-
- strcpy (src, rGroup->path);
- src_len = strlen (src);
-
+ else
+ {
+ SYSNO sysno = 0;
+ if (fileExtract (zh, &sysno, src, rGroup, 0))
+ dirs_add (di, src, sysno, sbuf.st_mtime);
+ }
+ dirs_free (&di);
+ }
+ else if (S_ISDIR(sbuf.st_mode))
+ {
if (src_len && src[src_len-1] != '/')
{
src[src_len] = '/';
src[++src_len] = '\0';
}
-
- di = dirs_open (dict, src);
-
+ di = dirs_open (dict, src, rGroup->flagRw);
*dst = '\0';
- fileUpdateR (di, dirs_read (di), src, dst, rGroup);
+ fileUpdateR (zh, di, dirs_read (di), src, dst, rGroup, 0);
dirs_free (&di);
- dict_close (dict);
}
- else
+ else
{
- strcpy (src, rGroup->path);
- if (*src == '\0' || !strcmp (src, "-"))
- stdinExtractR (0, rGroup);
- else
- repositoryExtractR (0, src, rGroup);
+ logf (LOG_WARN, "Ignoring path %s", src);
}
}
-void repositoryDelete (struct recordGroup *rGroup)
+
+static void repositoryExtract (ZebraHandle zh,
+ int deleteFlag, struct recordGroup *rGroup,
+ const char *path)
{
- char src[256];
+ struct stat sbuf;
+ char src[1024];
- assert (rGroup->path);
- groupRes (rGroup);
- strcpy (src, rGroup->path);
- if (*src == '\0' || !strcmp(src, "-"))
- stdinExtractR (1, rGroup);
+ assert (path);
+ strcpy (src, path);
+
+ stat (src, &sbuf);
+ if (S_ISREG(sbuf.st_mode))
+ fileExtract (zh, NULL, src, rGroup, deleteFlag);
+ else if (S_ISDIR(sbuf.st_mode))
+ repositoryExtractR (zh, deleteFlag, src, rGroup, 0);
+ else
+ logf (LOG_WARN, "Ignoring path %s", src);
+}
+
+static void repositoryExtractG (ZebraHandle zh,
+ int deleteFlag, struct recordGroup *rGroup)
+{
+ if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ {
+ char src[1024];
+
+ while (scanf ("%s", src) == 1)
+ repositoryExtract (zh, deleteFlag, rGroup, src);
+ }
else
- repositoryExtractR (1, src, rGroup);
+ repositoryExtract (zh, deleteFlag, rGroup, rGroup->path);
+}
+
+void repositoryUpdate (ZebraHandle zh)
+{
+ struct recordGroup *rGroup = &zh->rGroup;
+ groupRes (zh->service, rGroup);
+ assert (rGroup->path);
+ if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+ {
+ Dict dict;
+ if (!(dict = dict_open (zh->service->bfs, FMATCH_DICT, 50,
+ rGroup->flagRw, 0)))
+ {
+ logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ return ;
+ }
+ if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ {
+ char src[1024];
+ while (scanf ("%s", src) == 1)
+ fileUpdate (zh, dict, rGroup, src);
+ }
+ else
+ fileUpdate (zh, dict, rGroup, rGroup->path);
+ dict_close (dict);
+ }
+ else
+ repositoryExtractG (zh, 0, rGroup);
+}
+
+void repositoryDelete (ZebraHandle zh)
+{
+ repositoryExtractG (zh, 1, &zh->rGroup);
}
projects / idzebra-moved-to-github.git / blobdiff