X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=943b4f1b3206cca2a194ae45fbc09d75cdcb416e;hb=9289fb373f6404bb9d795c3a9eef42b4ce5d50d7;hp=6894ca571df4552c64395c8b0caf2596225e662c;hpb=5a47fb16ab0fc9574660a0ed04151f359c826cbf;p=idzebra-moved-to-github.git diff --git a/index/trav.c b/index/trav.c index 6894ca5..943b4f1 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,65 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: trav.c,v $ - * Revision 1.18 1996-03-19 12:43:27 adam + * 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 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 + * 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 * Bug fix: File update traversal didn't handle trailing slashes correctly. * Bug fix: Update of sub directory groups wasn't handled correctly. * @@ -72,16 +127,23 @@ * Split of work into more files. * */ + + #include #include -#include -#include -#include #include +#include +#ifdef WINDOWS +#include +#define S_ISREG(x) (x & _S_IFREG) +#define S_ISDIR(x) (x & _S_IFDIR) +#else +#include +#endif +#include #include -#include +#include -#include #include "index.h" static int repComp (const char *a, const char *b, size_t len) @@ -92,7 +154,8 @@ static int repComp (const char *a, const char *b, size_t len) } static void repositoryExtractR (int deleteFlag, char *rep, - struct recordGroup *rGroup) + struct recordGroup *rGroup, + int level) { struct dir_entry *e; int i; @@ -101,21 +164,28 @@ 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 --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); break; case dirs_dir: - repositoryExtractR (deleteFlag, rep, rGroup); + repositoryExtractR (deleteFlag, rep, rGroup, level+1); break; } } @@ -123,15 +193,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) @@ -163,8 +224,9 @@ static void fileDeleteR (struct dirs_info *di, struct dirs_entry *dst, } static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, - const char *base, char *src, - struct recordGroup *rGroup) + const char *base, char *src, + struct recordGroup *rGroup, + int level) { struct dir_entry *e_src; int i_src = 0; @@ -173,7 +235,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)) @@ -190,9 +252,8 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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) { @@ -231,6 +292,9 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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); @@ -239,17 +303,19 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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_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 (di, dst, base, src, rGroup, level+1); dst = dirs_last (di); logf (LOG_DEBUG, "last is %s", dst ? dst->path : "null"); break; @@ -268,10 +334,10 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, { 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); + fileUpdateR (di, dst, base, src, rGroup, level+1); if (dst) dst = dirs_last (di); break; @@ -311,9 +377,11 @@ static void groupRes (struct recordGroup *rGroup) sprintf (resStr, "%srecordId", gPrefix); rGroup->recordId = res_get (common_resource, resStr); + sprintf (resStr, "%sdatabasePath", gPrefix); + rGroup->databaseNamePath = + atoi (res_get_def (common_resource, resStr, "0")); } - void repositoryShow (struct recordGroup *rGroup) { char src[1024]; @@ -322,10 +390,10 @@ void repositoryShow (struct recordGroup *rGroup) Dict dict; struct dirs_info *di; - if (!(dict = dict_open (FMATCH_DICT, 50, 1))) + if (!(dict = dict_open (rGroup->bfs, FMATCH_DICT, 50, 0))) { logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT); - exit (1); + return; } assert (rGroup->path); @@ -338,7 +406,7 @@ void repositoryShow (struct recordGroup *rGroup) 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); @@ -346,61 +414,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); - + di = dirs_open (dict, src, rGroup->flagRw); *dst = '\0'; - fileUpdateR (di, dirs_read (di), src, dst, rGroup); + fileUpdateR (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 (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, 0); else - repositoryExtractR (1, src, rGroup); + logf (LOG_WARN, "Ignoring path %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 (rGroup->bfs, FMATCH_DICT, 50, rGroup->flagRw))) + { + 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 (dict, rGroup, src); + } + else + fileUpdate (dict, rGroup, rGroup->path); + dict_close (dict); + } + else + repositoryExtractG (0, rGroup); +} + +void repositoryDelete (struct recordGroup *rGroup) +{ + repositoryExtractG (1, rGroup); }