X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=recctrl%2Frectext.c;h=fd7f38d05d6332294802c1bda755506b21c46b85;hp=cd78a76399b097851ddb404bc25a5c371f88850b;hb=a8b86c35a39ce9eb5279c46dd99ef7e91b83fb7b;hpb=85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae diff --git a/recctrl/rectext.c b/recctrl/rectext.c index cd78a76..fd7f38d 100644 --- a/recctrl/rectext.c +++ b/recctrl/rectext.c @@ -1,62 +1,26 @@ -/* - * Copyright (C) 1994-1998, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rectext.c,v $ - * Revision 1.8 1998-05-20 10:12:27 adam - * Implemented automatic EXPLAIN database maintenance. - * Modified Zebra to work with ASN.1 compiled version of YAZ. - * - * Revision 1.7 1998/03/11 11:19:05 adam - * Changed the way sequence numbers are generated. - * - * Revision 1.6 1998/02/10 12:03:06 adam - * Implemented Sort. - * - * Revision 1.5 1997/10/27 14:33:06 adam - * Moved towards generic character mapping depending on "structure" - * field in abstract syntax file. Fixed a few memory leaks. Fixed - * bug with negative integers when doing searches with relational - * operators. - * - * Revision 1.4 1996/11/04 14:09:16 adam - * Minor changes. - * - * Revision 1.3 1996/11/01 09:00:33 adam - * This simple "text" format now supports element specs B and M. - * - * Revision 1.2 1996/10/29 14:02:45 adam - * Uses buffered read to speed up things. - * - * Revision 1.1 1996/10/11 10:57:28 adam - * New module recctrl. Used to manage records (extract/retrieval). - * - * Revision 1.7 1996/01/17 14:57:55 adam - * Prototype changed for reader functions in extract/retrieve. File - * is identified by 'void *' instead of 'int. - * - * Revision 1.6 1995/10/10 13:59:24 adam - * Function rset_open changed its wflag parameter to general flags. - * - * Revision 1.5 1995/10/02 16:24:39 adam - * Use attribute actually used in search requests. - * - * Revision 1.4 1995/10/02 15:42:55 adam - * Extract uses file descriptors instead of FILE pointers. - * - * Revision 1.3 1995/09/28 09:19:45 adam - * xfree/xmalloc used everywhere. - * Extract/retrieve method seems to work for text records. - * - * Revision 1.2 1995/09/15 14:45:21 adam - * Retrieve control. - * Work on truncation. - * - * Revision 1.1 1995/09/14 07:48:25 adam - * Record control management. - * - */ +/* $Id: rectext.c,v 1.19 2004-08-06 12:55:03 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + 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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include @@ -64,8 +28,22 @@ #include #include "rectext.h" -static void text_init (void) +struct text_info { + char *sep; +}; + +static void *text_init (RecType recType) { + struct text_info *tinfo = (struct text_info *) xmalloc(sizeof(*tinfo)); + tinfo->sep = 0; + return tinfo; +} + +static void text_destroy (void *clientData) +{ + struct text_info *tinfo = clientData; + xfree (tinfo->sep); + xfree (tinfo); } struct buf_info { @@ -77,16 +55,16 @@ struct buf_info { struct buf_info *buf_open (struct recExtractCtrl *p) { - struct buf_info *fi = xmalloc (sizeof(*fi)); + struct buf_info *fi = (struct buf_info *) xmalloc (sizeof(*fi)); fi->p = p; - fi->buf = xmalloc (4096); + fi->buf = (char *) xmalloc (4096); fi->offset = 1; fi->max = 1; return fi; } -int buf_read (struct buf_info *fi, char *dst) +int buf_read (struct text_info *tinfo, struct buf_info *fi, char *dst) { if (fi->offset >= fi->max) { @@ -98,6 +76,12 @@ int buf_read (struct buf_info *fi, char *dst) return 0; } *dst = fi->buf[(fi->offset)++]; + if (tinfo->sep && *dst == *tinfo->sep) + { + off_t off = (*fi->p->tellf)(fi->p->fh); + (*fi->p->endf)(fi->p->fh, off - (fi->max - fi->offset)); + return 0; + } return 1; } @@ -107,42 +91,54 @@ void buf_close (struct buf_info *fi) xfree (fi); } -static int text_extract (struct recExtractCtrl *p) +static int text_extract (void *clientData, struct recExtractCtrl *p) { + struct text_info *tinfo = clientData; char w[512]; RecWord recWord; int r; struct buf_info *fi = buf_open (p); +#if 0 + yaz_log(LOG_LOG, "text_extract off=%ld", + (long) (*fi->p->tellf)(fi->p->fh)); +#endif + xfree(tinfo->sep); + tinfo->sep = 0; + if (p->subType) { + if (!strncmp(p->subType, "sep=", 4)) + tinfo->sep = xstrdup(p->subType+4); + } (*p->init)(p, &recWord); recWord.reg_type = 'w'; do { int i = 0; - r = buf_read (fi, w); + r = buf_read (tinfo, fi, w); while (r > 0 && i < 511 && w[i] != '\n' && w[i] != '\r') { i++; - r = buf_read (fi, w + i); - } + r = buf_read (tinfo, fi, w + i); + } if (i) { recWord.string = w; recWord.length = i; - (*p->addWord)(&recWord); + (*p->tokenAdd)(&recWord); } } while (r > 0); buf_close (fi); - return 0; + return RECCTRL_EXTRACT_OK; } -static int text_retrieve (struct recRetrieveCtrl *p) +static int text_retrieve (void *clientData, struct recRetrieveCtrl *p) { int r, text_ptr = 0; static char *text_buf = NULL; static int text_size = 0; - int start_flag = 1; + int make_header = 1; + int make_body = 1; const char *elementSetName = NULL; int no_lines = 0; @@ -150,6 +146,21 @@ static int text_retrieve (struct recRetrieveCtrl *p) p->comp->u.simple->which == Z_ElementSetNames_generic) elementSetName = p->comp->u.simple->u.generic; + if (elementSetName) + { + /* don't make header for the R(aw) element set name */ + if (!strcmp(elementSetName, "R")) + { + make_header = 0; + make_body = 1; + } + /* only make header for the H(eader) element set name */ + else if (!strcmp(elementSetName, "H")) + { + make_header = 1; + make_body = 0; + } + } while (1) { if (text_ptr + 4096 >= text_size) @@ -157,7 +168,7 @@ static int text_retrieve (struct recRetrieveCtrl *p) char *nb; text_size = 2*text_size + 8192; - nb = xmalloc (text_size); + nb = (char *) xmalloc (text_size); if (text_buf) { memcpy (nb, text_buf, text_ptr); @@ -165,17 +176,25 @@ static int text_retrieve (struct recRetrieveCtrl *p) } text_buf = nb; } - if (start_flag) + if (make_header && text_ptr == 0) { - start_flag = 0; if (p->score >= 0) { sprintf (text_buf, "Rank: %d\n", p->score); text_ptr = strlen(text_buf); } - sprintf (text_buf + text_ptr, "Local Number: %d\n", p->localno); + sprintf (text_buf + text_ptr, "Local Number: " ZINT_FORMAT "\n", + p->localno); text_ptr = strlen(text_buf); + if (p->fname) + { + sprintf (text_buf + text_ptr, "Filename: %s\n", p->fname); + text_ptr = strlen(text_buf); + } + strcpy(text_buf+text_ptr++, "\n"); } + if (!make_body) + break; r = (*p->readf)(p->fh, text_buf + text_ptr, 4096); if (r <= 0) break; @@ -211,6 +230,7 @@ static int text_retrieve (struct recRetrieveCtrl *p) static struct recType text_type = { "text", text_init, + text_destroy, text_extract, text_retrieve };