X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fdirs.c;h=186f4776d0395049b4d6d400c0a75ae30673e4ca;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=c5636eee6813206e6694fa7924d86a9436404686;hpb=0b5d38bc84d5261aaed3bce3be748c5d7008f2ff;p=idzebra-moved-to-github.git diff --git a/index/dirs.c b/index/dirs.c index c5636ee..186f477 100644 --- a/index/dirs.c +++ b/index/dirs.c @@ -1,52 +1,28 @@ -/* - * Copyright (C) 1994-1996, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: dirs.c,v $ - * Revision 1.12 1996-11-08 11:10:13 adam - * Buffers used during file match got bigger. - * Compressed ISAM support everywhere. - * Bug fixes regarding masking characters in queries. - * Redesigned Regexp-2 queries. - * - * Revision 1.11 1996/10/29 14:06:47 adam - * Include zebrautl.h instead of alexutil.h. - * - * Revision 1.10 1996/06/04 10:18:58 adam - * Minor changes - removed include of ctype.h. - * - * Revision 1.9 1996/04/23 12:39:07 adam - * Bug fix: In function dirs_del dict_delete is used to remove a file - * rather than a bogus dict_insert. - * - * Revision 1.8 1996/04/12 07:02:21 adam - * File update of single files. - * - * Revision 1.7 1996/03/21 14:50:09 adam - * File update uses modify-time instead of change-time. - * - * Revision 1.6 1996/02/02 13:44:43 adam - * The public dictionary functions simply use char instead of Dict_char - * to represent search strings. Dict_char is used internally only. - * - * Revision 1.5 1996/01/17 14:54:44 adam - * Function dirs_rmdir uses dict_delete. - * - * Revision 1.4 1995/11/30 08:34:27 adam - * Started work on commit facility. - * Changed a few malloc/free to xmalloc/xfree. - * - * Revision 1.3 1995/11/20 16:59:45 adam - * New update method: the 'old' keys are saved for each records. - * - * Revision 1.2 1995/11/20 11:56:23 adam - * Work on new traversal. - * - * Revision 1.1 1995/11/17 15:54:42 adam - * Started work on virtual directory structure. - */ +/* $Id: dirs.c,v 1.25 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + + #include +#include #include #include #include @@ -57,6 +33,7 @@ struct dirs_info { Dict dict; + int rw; int no_read; int no_cur; int no_max; @@ -65,12 +42,13 @@ struct dirs_info { char prefix[DIRS_MAX_PATH]; int prelen; struct dirs_entry *last_entry; + int nextpath_deleted; }; static int dirs_client_proc (char *name, const char *info, int pos, void *client) { - struct dirs_info *ci = client; + struct dirs_info *ci = (struct dirs_info *) client; struct dirs_entry *entry; if (memcmp (name, ci->prefix, ci->prelen)) @@ -80,10 +58,7 @@ static int dirs_client_proc (char *name, const char *info, int pos, ci->no_cur = 0; return 0; } - if (ci->no_cur == ci->no_max) - { - assert (0); - } + assert (ci->no_cur < ci->no_max); entry = ci->entries + ci->no_cur; if (info[0] == sizeof(entry->sysno)+sizeof(entry->mtime)) { @@ -104,35 +79,39 @@ static int dirs_client_proc (char *name, const char *info, int pos, return 0; } -struct dirs_info *dirs_open (Dict dict, const char *rep) +struct dirs_info *dirs_open (Dict dict, const char *rep, int rw) { struct dirs_info *p; int before = 0, after; - logf (LOG_DEBUG, "dirs_open %s", rep); - p = xmalloc (sizeof (*p)); + yaz_log (YLOG_DEBUG, "dirs_open %s", rep); + p = (struct dirs_info *) xmalloc (sizeof (*p)); p->dict = dict; + p->rw = rw; strcpy (p->prefix, rep); p->prelen = strlen(p->prefix); strcpy (p->nextpath, rep); + p->nextpath_deleted = 0; p->no_read = p->no_cur = 0; after = p->no_max = 100; - p->entries = xmalloc (sizeof(*p->entries) * (p->no_max)); - logf (LOG_DEBUG, "dirs_open first scan"); + p->entries = (struct dirs_entry *) + xmalloc (sizeof(*p->entries) * (p->no_max)); + yaz_log (YLOG_DEBUG, "dirs_open first scan"); dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc); return p; } -struct dirs_info *dirs_fopen (Dict dict, const char *path) +struct dirs_info *dirs_fopen (Dict dict, const char *path, int rw) { struct dirs_info *p; struct dirs_entry *entry; char *info; - p = xmalloc (sizeof(*p)); + p = (struct dirs_info *) xmalloc (sizeof(*p)); p->dict = dict; + p->rw = rw; *p->prefix = '\0'; - p->entries = xmalloc (sizeof(*p->entries)); + p->entries = (struct dirs_entry *) xmalloc (sizeof(*p->entries)); p->no_read = 0; p->no_cur = 0; p->no_max = 2; @@ -157,17 +136,27 @@ struct dirs_entry *dirs_read (struct dirs_info *p) if (p->no_read < p->no_cur) { - logf (LOG_DEBUG, "dirs_read %d. returns %s", p->no_read, + yaz_log (YLOG_DEBUG, "dirs_read %d. returns %s", p->no_read, (p->entries + p->no_read)->path); return p->last_entry = p->entries + (p->no_read++); } if (p->no_cur < p->no_max) return p->last_entry = NULL; - p->no_cur = -1; - logf (LOG_DEBUG, "dirs_read rescan"); - dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc); + if (p->nextpath_deleted) + { + p->no_cur = 0; + after = p->no_max; + } + else + { + p->no_cur = -1; + after = p->no_max + 1; + } p->no_read = 1; - if (p->no_read < p->no_cur) + p->nextpath_deleted = 0; + yaz_log (YLOG_DEBUG, "dirs_read rescan %s", p->nextpath); + dict_scan (p->dict, p->nextpath, &before, &after, p, dirs_client_proc); + if (p->no_read <= p->no_cur) return p->last_entry = p->entries; return p->last_entry = NULL; } @@ -182,8 +171,9 @@ void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime) char path[DIRS_MAX_PATH]; sprintf (path, "%s%s", p->prefix, src); - logf (LOG_DEBUG, "dirs_mkdir %s", path); - dict_insert (p->dict, path, sizeof(mtime), &mtime); + yaz_log (YLOG_DEBUG, "dirs_mkdir %s", path); + if (p->rw) + dict_insert (p->dict, path, sizeof(mtime), &mtime); } void dirs_rmdir (struct dirs_info *p, const char *src) @@ -191,20 +181,22 @@ void dirs_rmdir (struct dirs_info *p, const char *src) char path[DIRS_MAX_PATH]; sprintf (path, "%s%s", p->prefix, src); - logf (LOG_DEBUG, "dirs_rmdir %s", path); - dict_delete (p->dict, path); + yaz_log (YLOG_DEBUG, "dirs_rmdir %s", path); + if (p->rw) + dict_delete (p->dict, path); } -void dirs_add (struct dirs_info *p, const char *src, int sysno, time_t mtime) +void dirs_add (struct dirs_info *p, const char *src, SYSNO sysno, time_t mtime) { char path[DIRS_MAX_PATH]; char info[16]; sprintf (path, "%s%s", p->prefix, src); - logf (LOG_DEBUG, "dirs_add %s", path); + yaz_log (YLOG_DEBUG, "dirs_add %s", path); memcpy (info, &sysno, sizeof(sysno)); memcpy (info+sizeof(sysno), &mtime, sizeof(mtime)); - dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info); + if (p->rw) + dict_insert (p->dict, path, sizeof(sysno)+sizeof(mtime), info); } void dirs_del (struct dirs_info *p, const char *src) @@ -212,8 +204,13 @@ void dirs_del (struct dirs_info *p, const char *src) char path[DIRS_MAX_PATH]; sprintf (path, "%s%s", p->prefix, src); - logf (LOG_DEBUG, "dirs_del %s", path); - dict_delete (p->dict, path); + yaz_log (YLOG_DEBUG, "dirs_del %s", path); + if (p->rw) + { + if (!strcmp(path, p->nextpath)) + p->nextpath_deleted = 1; + dict_delete (p->dict, path); + } } void dirs_free (struct dirs_info **pp) @@ -225,3 +222,11 @@ void dirs_free (struct dirs_info **pp) *pp = NULL; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +