X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=b3ffb458f476cc90921d5c0330b4adb4f0f4e365;hb=c0c85097014e5b007075ab71d9b5bee412e28dd5;hp=55e38c5ce41f1cb5bc43c1ed073473f1910d642f;hpb=c0883a6fae21edf72536dd4514bc409dfba3383a;p=idzebra-moved-to-github.git diff --git a/index/trav.c b/index/trav.c index 55e38c5..b3ffb45 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,35 @@ /* - * 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.22 1996-04-09 06:50:50 adam + * Revision 1.29 1997-02-12 20:39:47 adam + * Implemented options -f that limits the log to the first + * 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 @@ -91,10 +116,8 @@ #include #include #include -#include #include -#include #include "index.h" static int repComp (const char *a, const char *b, size_t len) @@ -114,7 +137,7 @@ static void repositoryExtractR (int deleteFlag, char *rep, 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 @@ -136,15 +159,6 @@ static void repositoryExtractR (int deleteFlag, char *rep, } -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) @@ -186,7 +200,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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)) @@ -257,8 +271,8 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, { 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; @@ -327,7 +341,6 @@ static void groupRes (struct recordGroup *rGroup) rGroup->recordId = res_get (common_resource, resStr); } - void repositoryShow (struct recordGroup *rGroup) { char src[1024]; @@ -360,61 +373,118 @@ void repositoryShow (struct recordGroup *rGroup) 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 - repositoryExtractR (1, src, rGroup); + 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 + 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); }