X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrav.c;h=b855eadfc80a92c7218c13f44eda445e17a9f66c;hb=5adb31268b057741850de38eafd42baf8dc947ea;hp=b3ffb458f476cc90921d5c0330b4adb4f0f4e365;hpb=9167923869bcb07faf7e357c883f070be098c66e;p=idzebra-moved-to-github.git diff --git a/index/trav.c b/index/trav.c index b3ffb45..b855ead 100644 --- a/index/trav.c +++ b/index/trav.c @@ -1,10 +1,37 @@ /* - * 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.29 1997-02-12 20:39:47 adam + * 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 that limits the log to the first * records. * Changed some log messages also. @@ -109,16 +136,25 @@ * 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 #include "index.h" +#include "zserver.h" static int repComp (const char *a, const char *b, size_t len) { @@ -127,8 +163,9 @@ 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; @@ -142,16 +179,23 @@ static void repositoryExtractR (int deleteFlag, char *rep, 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; } } @@ -159,9 +203,10 @@ static void repositoryExtractR (int deleteFlag, char *rep, } -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); @@ -172,7 +217,7 @@ static void fileDeleteR (struct dirs_info *di, struct dirs_entry *dst, { 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); @@ -189,9 +234,11 @@ 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) +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; @@ -223,7 +270,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, else if (!e_src) { strcpy (src, dst->path); - fileDeleteR (di, dst, base, src, rGroup); + fileDeleteR (zh, di, dst, base, src, rGroup); return; } else @@ -257,6 +304,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); @@ -267,7 +317,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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); } @@ -277,7 +327,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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; @@ -295,11 +345,11 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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; @@ -314,12 +364,12 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, 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); } } @@ -327,7 +377,7 @@ static void fileUpdateR (struct dirs_info *di, struct dirs_entry *dst, dir_free (&e_src); } -static void groupRes (struct recordGroup *rGroup) +static void groupRes (ZebraService zs, struct recordGroup *rGroup) { char resStr[256]; char gPrefix[256]; @@ -338,21 +388,26 @@ static void groupRes (struct recordGroup *rGroup) 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); @@ -365,7 +420,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); @@ -373,7 +428,8 @@ void repositoryShow (struct recordGroup *rGroup) dict_close (dict); } -static void fileUpdate (Dict dict, struct recordGroup *rGroup, +static void fileUpdate (ZebraHandle zh, + Dict dict, struct recordGroup *rGroup, const char *path) { struct dirs_info *di; @@ -396,13 +452,13 @@ static void fileUpdate (Dict dict, struct recordGroup *rGroup, if (e_dst) { if (sbuf.st_mtime > e_dst->mtime) - if (fileExtract (&e_dst->sysno, src, rGroup, 0)) + if (fileExtract (zh, &e_dst->sysno, src, rGroup, 0)) dirs_add (di, src, e_dst->sysno, sbuf.st_mtime); } else { SYSNO sysno = 0; - if (fileExtract (&sysno, src, rGroup, 0)) + if (fileExtract (zh, &sysno, src, rGroup, 0)) dirs_add (di, src, sysno, sbuf.st_mtime); } dirs_free (&di); @@ -414,19 +470,20 @@ 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 (zh, 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); } } -static void repositoryExtract (int deleteFlag, struct recordGroup *rGroup, +static void repositoryExtract (ZebraHandle zh, + int deleteFlag, struct recordGroup *rGroup, const char *path) { struct stat sbuf; @@ -437,54 +494,57 @@ static void repositoryExtract (int deleteFlag, struct recordGroup *rGroup, stat (src, &sbuf); if (S_ISREG(sbuf.st_mode)) - fileExtract (NULL, src, rGroup, deleteFlag); + fileExtract (zh, NULL, src, rGroup, deleteFlag); else if (S_ISDIR(sbuf.st_mode)) - repositoryExtractR (deleteFlag, src, rGroup); + repositoryExtractR (zh, 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) +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 (deleteFlag, rGroup, src); + repositoryExtract (zh, deleteFlag, rGroup, src); } else - repositoryExtract (deleteFlag, rGroup, rGroup->path); + repositoryExtract (zh, deleteFlag, rGroup, rGroup->path); } -void repositoryUpdate (struct recordGroup *rGroup) +void repositoryUpdate (ZebraHandle zh) { - groupRes (rGroup); + 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 (FMATCH_DICT, 50, 1))) + if (!(dict = dict_open (zh->service->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, "-")) { char src[1024]; while (scanf ("%s", src) == 1) - fileUpdate (dict, rGroup, src); + fileUpdate (zh, dict, rGroup, src); } else - fileUpdate (dict, rGroup, rGroup->path); + fileUpdate (zh, dict, rGroup, rGroup->path); dict_close (dict); } else - repositoryExtractG (0, rGroup); + repositoryExtractG (zh, 0, rGroup); } -void repositoryDelete (struct recordGroup *rGroup) +void repositoryDelete (ZebraHandle zh) { - repositoryExtractG (1, rGroup); + repositoryExtractG (zh, 1, &zh->rGroup); }