/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1996, Index Data I/S
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: trav.c,v $
- * Revision 1.19 1996-03-20 16:16:55 quinn
+ * 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
+ * File update uses modify-time instead of change-time.
+ *
+ * Revision 1.19 1996/03/20 16:16:55 quinn
* Added diagnostic output
*
* Revision 1.18 1996/03/19 12:43:27 adam
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
-#include <ctype.h>
#include <time.h>
-#include <alexutil.h>
#include "index.h"
static int repComp (const char *a, const char *b, size_t len)
}
-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)
src[++src_len] = '\0';
}
dirs_mkdir (di, src, 0);
-#if 0
- dst = NULL;
-#endif
+ if (dst && repComp (dst->path, src, src_len))
+ dst = NULL;
}
else if (!e_src)
{
switch (e_src[i_src].kind)
{
case dirs_file:
- if (e_src[i_src].ctime > dst->ctime)
+ if (e_src[i_src].mtime > dst->mtime)
{
if (fileExtract (&dst->sysno, tmppath, rGroup, 0))
{
- dirs_add (di, src, dst->sysno, e_src[i_src].ctime);
+ dirs_add (di, src, dst->sysno, e_src[i_src].mtime);
}
- logf (LOG_LOG, "old: %s", ctime (&dst->ctime));
- logf (LOG_LOG, "new: %s", ctime (&e_src[i_src].ctime));
+ 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_file:
if (fileExtract (&sysno, tmppath, rGroup, 0))
- dirs_add (di, src, sysno, e_src[i_src].ctime);
+ dirs_add (di, src, sysno, e_src[i_src].mtime);
break;
case dirs_dir:
fileUpdateR (di, dst, base, src, rGroup);
rGroup->recordId = res_get (common_resource, resStr);
}
-
void repositoryShow (struct recordGroup *rGroup)
{
char src[1024];
dict_close (dict);
}
-void repositoryUpdate (struct recordGroup *rGroup)
+static void fileUpdate (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 (&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 (&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);
-
*dst = '\0';
fileUpdateR (di, dirs_read (di), src, dst, rGroup);
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, "Cannot handle file %s", src);
}
}
-void repositoryDelete (struct recordGroup *rGroup)
+
+static void repositoryExtract (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 (NULL, src, rGroup, deleteFlag);
+ else if (S_ISDIR(sbuf.st_mode))
+ repositoryExtractR (deleteFlag, src, rGroup);
+ else
+ logf (LOG_WARN, "Cannot handle file %s", src);
+}
+
+static void repositoryExtractG (int deleteFlag, struct recordGroup *rGroup)
+{
+ if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ {
+ char src[1024];
+
+ while (scanf ("%s", src) == 1)
+ repositoryExtract (deleteFlag, rGroup, src);
+ }
else
- repositoryExtractR (1, src, rGroup);
+ repositoryExtract (deleteFlag, rGroup, rGroup->path);
+}
+
+void repositoryUpdate (struct recordGroup *rGroup)
+{
+ groupRes (rGroup);
+ assert (rGroup->path);
+ if (rGroup->recordId && !strcmp (rGroup->recordId, "file"))
+ {
+ Dict dict;
+ if (!(dict = dict_open (FMATCH_DICT, 50, 1)))
+ {
+ logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT);
+ exit (1);
+ }
+ if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-"))
+ {
+ char src[1024];
+ while (scanf ("%s", src) == 1)
+ fileUpdate (dict, rGroup, src);
+ }
+ else
+ fileUpdate (dict, rGroup, rGroup->path);
+ dict_close (dict);
+ }
+ else
+ repositoryExtractG (0, rGroup);
+}
+
+void repositoryDelete (struct recordGroup *rGroup)
+{
+ repositoryExtractG (1, rGroup);
}
projects / idzebra-moved-to-github.git / blobdiff