X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=bfile%2Fbfile.c;h=b38ff42f916c311b42e94cc72c332945af4eae27;hb=00796628a5c7dec56efe81be9cf781bb98afc47d;hp=256fe62ef40635a9dfe8321074ec7c36c803f126;hpb=ed679affe3ae7402b38418f6b98fb8744915e19b;p=idzebra-moved-to-github.git diff --git a/bfile/bfile.c b/bfile/bfile.c index 256fe62..b38ff42 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -1,10 +1,46 @@ /* - * Copyright (C) 1994, Index Data I/S + * Copyright (C) 1994-1997, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.14 1995-12-01 11:37:21 adam + * Revision 1.25 1997-10-27 14:25:38 adam + * Fixed memory leaks. + * + * Revision 1.24 1997/09/18 08:59:16 adam + * Extra generic handle for the character mapping routines. + * + * Revision 1.23 1997/09/17 12:19:06 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.22 1997/09/09 13:37:52 adam + * Partial port to WIN95/NT. + * + * Revision 1.21 1996/10/29 13:56:13 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.20 1996/03/26 15:59:04 adam + * The directory of the shadow table file can be specified by the new + * bf_lockDir call. + * + * Revision 1.19 1996/02/05 12:28:58 adam + * Removed a LOG_LOG message. + * + * Revision 1.18 1996/01/02 08:59:06 quinn + * Changed "commit" setting to "shadow". + * + * Revision 1.17 1995/12/11 09:03:51 adam + * New function: cf_unlink. + * New member of commit file head: state (0) deleted, (1) hash file. + * + * Revision 1.16 1995/12/08 16:21:13 adam + * Work on commit/update. + * + * Revision 1.15 1995/12/01 16:24:28 adam + * Commit files use separate meta file area. + * + * Revision 1.14 1995/12/01 11:37:21 adam * Cached/commit files implemented as meta-files. * * Revision 1.13 1995/11/30 17:00:49 adam @@ -46,21 +82,86 @@ */ #include -#include -#include -#include #include +#include +#include +#ifdef WINDOWS +#include +#else +#include +#endif -#include +#include #include #include "cfile.h" -static MFile_area commit_area = NULL; +struct BFiles_struct { + MFile_area commit_area; + MFile_area_struct *register_area; + char *lockDir; +}; + +BFiles bfs_create (const char *spec) +{ + BFiles bfs = xmalloc (sizeof(*bfs)); + bfs->commit_area = NULL; + bfs->register_area = mf_init("register", spec); + bfs->lockDir = NULL; + return bfs; +} -void bf_cache (void) +void bfs_destroy (BFiles bfs) { - if (!commit_area) - commit_area = mf_init ("commit"); + xfree (bfs->lockDir); + mf_destroy (bfs->commit_area); + mf_destroy (bfs->register_area); + xfree (bfs); +} + +static FILE *open_cache (BFiles bfs, const char *flags) +{ + char cacheFilename[1024]; + FILE *file; + + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); + file = fopen (cacheFilename, flags); + return file; +} + +static void unlink_cache (BFiles bfs) +{ + char cacheFilename[1024]; + + sprintf (cacheFilename, "%scache", + bfs->lockDir ? bfs->lockDir : ""); + unlink (cacheFilename); +} + +void bf_lockDir (BFiles bfs, const char *lockDir) +{ + size_t len; + + xfree (bfs->lockDir); + if (lockDir == NULL) + lockDir = ""; + len = strlen(lockDir); + bfs->lockDir = xmalloc (len+2); + strcpy (bfs->lockDir, lockDir); + + if (len > 0 && bfs->lockDir[len-1] != '/') + strcpy (bfs->lockDir + len, "/"); +} + +void bf_cache (BFiles bfs, const char *spec) +{ + if (spec) + { + if (!bfs->commit_area) + bfs->commit_area = mf_init ("shadow", spec); + } + else + bfs->commit_area = NULL; } int bf_close (BFile bf) @@ -72,29 +173,35 @@ int bf_close (BFile bf) return 0; } -BFile bf_open (const char *name, int block_size, int wflag) +BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag) { BFile tmp = xmalloc(sizeof(BFile_struct)); - if (commit_area) + if (bfs->commit_area) { - FILE *outf; int first_time; - logf (LOG_LOG, "cf,mf_open %s", name); - tmp->mf = mf_open (commit_area, name, block_size, 0); - tmp->cf = cf_open (tmp->mf, name, block_size, wflag, &first_time); - + tmp->mf = mf_open (bfs->register_area, name, block_size, 0); + tmp->cf = cf_open (tmp->mf, bfs->commit_area, name, block_size, + wflag, &first_time); if (first_time) { - outf = fopen ("cache", "a"); + FILE *outf; + + outf = open_cache (bfs, "a"); + if (!outf) + { + logf (LOG_FATAL|LOG_ERRNO, "open %scache", + bfs->lockDir ? bfs->lockDir : ""); + exit (1); + } fprintf (outf, "%s %d\n", name, block_size); fclose (outf); } } else { - tmp->mf = mf_open(0, name, block_size, wflag); + tmp->mf = mf_open(bfs->register_area, name, block_size, wflag); tmp->cf = NULL; } if (!tmp->mf) @@ -122,7 +229,20 @@ int bf_write (BFile bf, int no, int offset, int num, const void *buf) return mf_write (bf->mf, no, offset, num, buf); } -void bf_commit (void) +int bf_commitExists (BFiles bfs) +{ + FILE *inf; + + inf = open_cache (bfs, "r"); + if (inf) + { + fclose (inf); + return 1; + } + return 0; +} + +void bf_commitExec (BFiles bfs) { FILE *inf; int block_size; @@ -131,17 +251,16 @@ void bf_commit (void) CFile cf; int first_time; - if (!commit_area) - commit_area = mf_init ("commit"); - if (!(inf = fopen ("cache", "r"))) + assert (bfs->commit_area); + if (!(inf = open_cache (bfs, "r"))) { - logf (LOG_FATAL|LOG_ERRNO, "cannot open commit %s", "cache"); - exit (1); + logf (LOG_LOG, "No commit file"); + return ; } while (fscanf (inf, "%s %d", path, &block_size) == 2) { - mf = mf_open (commit_area, path, block_size, 1); - cf = cf_open (mf, path, block_size, 0, &first_time); + mf = mf_open (bfs->register_area, path, block_size, 1); + cf = cf_open (mf, bfs->commit_area, path, block_size, 0, &first_time); cf_commit (cf); @@ -150,3 +269,35 @@ void bf_commit (void) } fclose (inf); } + +void bf_commitClean (BFiles bfs, const char *spec) +{ + FILE *inf; + int block_size; + char path[256]; + MFile mf; + CFile cf; + int mustDisable = 0; + int firstTime; + + if (!bfs->commit_area) + { + bf_cache (bfs, spec); + mustDisable = 1; + } + + if (!(inf = open_cache (bfs, "r"))) + return ; + while (fscanf (inf, "%s %d", path, &block_size) == 2) + { + mf = mf_open (bfs->register_area, path, block_size, 0); + cf = cf_open (mf, bfs->commit_area, path, block_size, 1, &firstTime); + cf_unlink (cf); + cf_close (cf); + mf_close (mf); + } + fclose (inf); + unlink_cache (bfs); + if (mustDisable) + bf_cache (bfs, 0); +}