X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=150fc27a9f68509d5661da83065adccbe6cfc59b;hb=0f6cf21e0feb7059bbd7576a44ac61470eb09d0b;hp=b11b793ce9336d28b01f48908ddb5dad75b691e9;hpb=c325477904a47c61586ad9b756b9280c22351c6b;p=idzebra-moved-to-github.git diff --git a/index/trav.c b/index/trav.c index b11b793..150fc27 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,42 @@ /* - * Copyright (C) 1994-1996, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: trav.c,v $ - * Revision 1.27 1996-10-29 14:06:56 adam + * 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 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 @@ -101,12 +133,20 @@ * Split of work into more files. * */ + + #include #include -#include -#include -#include #include +#include +#ifdef WIN32 +#include +#define S_ISREG(x) (x & _S_IFREG) +#define S_ISDIR(x) (x & _S_IFDIR) +#else +#include +#endif +#include #include #include @@ -120,7 +160,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; @@ -129,21 +170,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; } } @@ -182,8 +230,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; @@ -192,7 +241,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)) @@ -249,6 +298,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); @@ -263,13 +315,13 @@ 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; 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; @@ -291,7 +343,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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; @@ -331,6 +383,9 @@ 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) @@ -341,10 +396,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, 0))) { logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT); - exit (1); + return; } assert (rGroup->path); @@ -357,7 +412,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); @@ -406,14 +461,14 @@ static void fileUpdate (Dict dict, struct recordGroup *rGroup, 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); } else { - logf (LOG_WARN, "Cannot handle file %s", src); + logf (LOG_WARN, "Ignoring path %s", src); } } @@ -431,9 +486,9 @@ static void repositoryExtract (int deleteFlag, struct recordGroup *rGroup, if (S_ISREG(sbuf.st_mode)) fileExtract (NULL, src, rGroup, deleteFlag); else if (S_ISDIR(sbuf.st_mode)) - repositoryExtractR (deleteFlag, src, rGroup); + repositoryExtractR (deleteFlag, src, rGroup, 0); else - logf (LOG_WARN, "Cannot handle file %s", src); + logf (LOG_WARN, "Ignoring path %s", src); } static void repositoryExtractG (int deleteFlag, struct recordGroup *rGroup) @@ -456,10 +511,11 @@ void repositoryUpdate (struct recordGroup *rGroup) if (rGroup->recordId && !strcmp (rGroup->recordId, "file")) { Dict dict; - if (!(dict = dict_open (FMATCH_DICT, 50, 1))) + if (!(dict = dict_open (rGroup->bfs, FMATCH_DICT, 50, + rGroup->flagRw, 0))) { logf (LOG_FATAL, "dict_open fail of %s", FMATCH_DICT); - exit (1); + return ; } if (*rGroup->path == '\0' || !strcmp(rGroup->path, "-")) {