X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frstemp.c;h=f200e8bdf49a8439f31b8f4dc7230a527287185a;hb=7b0a5daa703117cde2dc0d54d5a39941a1c01ce8;hp=0c835f91e8d534f77157415d42880a07bb7f0930;hpb=a322231bcd4bfed2886c571aa91da5f73cad62a9;p=idzebra-moved-to-github.git diff --git a/rset/rstemp.c b/rset/rstemp.c index 0c835f9..f200e8b 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -4,7 +4,43 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rstemp.c,v $ - * Revision 1.7 1995-09-07 13:58:44 adam + * Revision 1.17 1995-12-11 09:15:28 adam + * New set types: sand/sor/snot - ranked versions of and/or/not in + * ranked/semi-ranked result sets. + * Note: the snot not finished yet. + * New rset member: flag. + * Bug fix: r_delete in rsrel.c did free bad memory block. + * + * Revision 1.16 1995/11/28 14:47:02 adam + * New setting: tempSetPath. Location of temporary result sets. + * + * Revision 1.15 1995/10/12 12:41:58 adam + * Private info (buf) moved from struct rset_control to struct rset. + * Bug fixes in relevance. + * + * Revision 1.14 1995/10/10 14:00:04 adam + * Function rset_open changed its wflag parameter to general flags. + * + * Revision 1.13 1995/10/06 14:38:06 adam + * New result set method: r_score. + * Local no (sysno) and score is transferred to retrieveCtrl. + * + * Revision 1.12 1995/09/28 09:52:11 adam + * xfree/xmalloc used everywhere. + * + * Revision 1.11 1995/09/18 14:17:56 adam + * Bug fixes. + * + * Revision 1.10 1995/09/15 14:45:39 adam + * Bug fixes. + * + * Revision 1.9 1995/09/15 09:20:42 adam + * Bug fixes. + * + * Revision 1.8 1995/09/08 14:52:42 adam + * Work on relevance feedback. + * + * Revision 1.7 1995/09/07 13:58:44 adam * New parameter: result-set file descriptor (RSFD) to support multiple * positions within the same result-set. * Boolean operators: and, or, not implemented. @@ -38,19 +74,23 @@ #include #include -static rset_control *r_create(const struct rset_control *sel, void *parms); -static RSFD r_open (rset_control *ct, int wflag); +static void *r_create(const struct rset_control *sel, void *parms, + int *flags); +static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); -static void r_delete (rset_control *ct); +static void r_delete (RSET ct); static void r_rewind (RSFD rfd); -static int r_count (rset_control *ct); +static int r_count (RSET ct); static int r_read (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); +static int r_score (RSFD rfd, int *score); + +static int temppath_init = 0; +static char *temppath_root = NULL; static const rset_control control = { - "Temporary set", - 0, + "temp", r_create, r_open, r_close, @@ -58,7 +98,8 @@ static const rset_control control = r_rewind, r_count, r_read, - r_write + r_write, + r_score }; const rset_control *rset_kind_temp = &control; @@ -66,14 +107,14 @@ const rset_control *rset_kind_temp = &control; struct rset_temp_info { int fd; char *fname; - size_t key_size; - char *buf_mem; - size_t buf_size; - size_t pos_end; - size_t pos_cur; - size_t pos_buf; - size_t pos_border; - int dirty; + size_t key_size; /* key size */ + char *buf_mem; /* window buffer */ + size_t buf_size; /* size of window */ + size_t pos_end; /* last position in set */ + size_t pos_cur; /* current position in set */ + size_t pos_buf; /* position of first byte in window */ + size_t pos_border; /* position of last byte+1 in window */ + int dirty; /* window is dirty */ }; struct rset_temp_rfd { @@ -81,33 +122,31 @@ struct rset_temp_rfd { struct rset_temp_rfd *next; }; -static struct rset_control *r_create(const struct rset_control *sel, - void *parms) +static void *r_create(const struct rset_control *sel, void *parms, int *flags) { - rset_control *newct; rset_temp_parms *temp_parms = parms; struct rset_temp_info *info; - - logf (LOG_DEBUG, "ritemp_create(%s)", sel->desc); - newct = xmalloc(sizeof(*newct)); - memcpy(newct, sel, sizeof(*sel)); - newct->buf = xmalloc (sizeof(struct rset_temp_info)); - info = newct->buf; - + + info = xmalloc (sizeof(struct rset_temp_info)); info->fd = -1; info->fname = NULL; info->key_size = temp_parms->key_size; - info->buf_size = 1024; + info->buf_size = 4096; info->buf_mem = xmalloc (info->buf_size); info->pos_cur = 0; info->pos_end = 0; info->pos_buf = 0; info->dirty = 0; - return newct; + if (!temppath_init) + { + temppath_init = 1; + temppath_root = res_get (common_resource, "tempSetPath"); + } + return info; } -static RSFD r_open (struct rset_control *ct, int wflag) +static RSFD r_open (RSET ct, int flag) { struct rset_temp_info *info = ct->buf; struct rset_temp_rfd *rfd; @@ -115,7 +154,7 @@ static RSFD r_open (struct rset_control *ct, int wflag) assert (info->fd == -1); if (info->fname) { - if (wflag) + if (flag & RSETF_WRITE) info->fd = open (info->fname, O_RDWR|O_CREAT, 0666); else info->fd = open (info->fname, O_RDONLY); @@ -127,21 +166,25 @@ static RSFD r_open (struct rset_control *ct, int wflag) } rfd = xmalloc (sizeof(*rfd)); rfd->info = info; - r_rewind (ct); + r_rewind (rfd); return rfd; } +/* r_flush: + flush current window to file if file is assocated with set + */ static void r_flush (RSFD rfd, int mk) { struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; if (!info->fname && mk) { - char *s = (char*) tempnam (NULL, "zrs"); + char *s = (char*) tempnam (temppath_root, "zrs"); info->fname = xmalloc (strlen(s)+1); strcpy (info->fname, s); + logf (LOG_DEBUG, "creating tempfile %s", info->fname); info->fd = open (info->fname, O_RDWR|O_CREAT, 0666); if (info->fd == -1) { @@ -186,18 +229,27 @@ static void r_close (RSFD rfd) } } -static void r_delete (struct rset_control *ct) +static void r_delete (RSET ct) { struct rset_temp_info *info = ct->buf; - r_close (ct); if (info->fname) unlink (info->fname); free (info->buf_mem); - free (info->fname); + logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end); + if (info->fname) + { + logf (LOG_DEBUG, "r_delete: unlink %s", info->fname); + unlink (info->fname); + free (info->fname); + } free (info); } +/* r_reread: + read from file to window if file is assocated with set - + indicated by fname + */ static void r_reread (RSFD rfd) { struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; @@ -211,6 +263,12 @@ static void r_reread (RSFD rfd) info->pos_border = info->pos_end; count = info->pos_border - info->pos_buf; if (count > 0) + { + if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) + { + logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); + exit (1); + } if ((r = read (info->fd, info->buf_mem, count)) < count) { if (r == -1) @@ -220,6 +278,7 @@ static void r_reread (RSFD rfd) (long) count, (long) r); exit (1); } + } } else info->pos_border = info->pos_end; @@ -235,7 +294,7 @@ static void r_rewind (RSFD rfd) r_reread (rfd); } -static int r_count (struct rset_control *ct) +static int r_count (RSET ct) { struct rset_temp_info *info = ct->buf; @@ -272,12 +331,20 @@ static int r_write (RSFD rfd, const void *buf) { r_flush (rfd, 1); info->pos_buf = info->pos_cur; - r_reread (rfd); + if (info->pos_buf < info->pos_end) + r_reread (rfd); } + info->dirty = 1; memcpy (info->buf_mem + (info->pos_cur - info->pos_buf), buf, info->key_size); - info->dirty = 1; - info->pos_border = info->pos_cur = nc; + info->pos_cur = nc; + if (nc > info->pos_end) + info->pos_border = info->pos_end = nc; return 1; } +static int r_score (RSFD rfd, int *score) +{ + *score = -1; + return -1; +}