From: Adam Dickmeiss Date: Thu, 18 Feb 1999 12:49:31 +0000 (+0000) Subject: Changed file naming scheme for register files as well as record X-Git-Tag: ZEBRA.1.0~131 X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=21e03c79e86bc7f7edcd0469d40186fabd9a15f4 Changed file naming scheme for register files as well as record store/index files. --- diff --git a/CHANGELOG b/CHANGELOG index 50bae80..bc7f370 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +Changed file naming scheme for register files from .mf. to +-.mf. + Implemented "position"-flag for register type (as defined in default.idx). When set to zero no position (or seqence number) is saved in register for each word occurrence, thus saving some register diff --git a/Makefile.in b/Makefile.in index 16d78c2..d218d9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Copyright (C) 1994-1998, Index Data +# Copyright (C) 1994-1999, Index Data # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile.in,v 1.2 1998-10-28 15:20:40 adam Exp $ +# $Id: Makefile.in,v 1.3 1999-02-18 12:49:32 adam Exp $ SHELL=/bin/sh MAKE=make diff --git a/bfile/mfile.c b/bfile/mfile.c index a9dc9f6..8e4fb79 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -4,7 +4,11 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: mfile.c,v $ - * Revision 1.30 1999-02-02 14:50:02 adam + * Revision 1.31 1999-02-18 12:49:33 adam + * Changed file naming scheme for register files as well as record + * store/index files. + * + * Revision 1.30 1999/02/02 14:50:02 adam * Updated WIN32 code specific sections. Changed header. * * Revision 1.29 1998/05/27 14:28:34 adam @@ -276,7 +280,7 @@ MFile_area mf_init(const char *name, const char *spec) { if (*dent->d_name == '.') continue; - if (sscanf(dent->d_name, "%[^.].mf.%d", metaname, &number) != 2) + if (sscanf(dent->d_name, "%[^-]-%d.mf", metaname, &number) != 2) { logf (LOG_DEBUG, "bf: %s is not a part-file.", dent->d_name); continue; @@ -406,7 +410,7 @@ MFile mf_open(MFile_area ma, const char *name, int block_size, int wflag) return 0; } mnew->files[0].dir = dp; - sprintf(tmp, "%s/%s.mf.%d", dp->name, mnew->name, 0); + sprintf(tmp, "%s/%s-%d.mf", dp->name, mnew->name, 0); mnew->files[0].path = xstrdup(tmp); mnew->ma = ma; mnew->next = ma->mfiles; diff --git a/index/recindex.c b/index/recindex.c index 2d50d86..8f3005c 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -4,7 +4,11 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: recindex.c,v $ - * Revision 1.21 1999-02-02 14:51:03 adam + * Revision 1.22 1999-02-18 12:49:34 adam + * Changed file naming scheme for register files as well as record + * store/index files. + * + * Revision 1.21 1999/02/02 14:51:03 adam * Updated WIN32 code specific sections. Changed header. * * Revision 1.20 1998/01/12 15:04:08 adam @@ -280,7 +284,7 @@ Records rec_open (BFiles bfs, int rw) p->rw = rw; p->tmp_size = 1024; p->tmp_buf = xmalloc (p->tmp_size); - p->index_fname = "recindex"; + p->index_fname = "reci"; p->index_BFile = bf_open (bfs, p->index_fname, 128, rw); if (p->index_BFile == NULL) { @@ -324,7 +328,7 @@ Records rec_open (BFiles bfs, int rw) for (i = 0; idata_fname[i] = xmalloc (strlen(str)+1); strcpy (p->data_fname[i], str); p->data_BFile[i] = NULL;