X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=recctrl%2Frectext.c;h=99957160e14c15d27e8f2c9242750ece899e18ec;hb=896c0427df9d8eff5de6a1735dcd992e067df844;hp=4c275225c764fbbab606dc2093ba7390c5e45f38;hpb=75049be3951292bbbbd53d83ca38ccbd191e4b08;p=idzebra-moved-to-github.git

diff --git a/recctrl/rectext.c b/recctrl/rectext.c
index 4c27522..9995716 100644
--- a/recctrl/rectext.c
+++ b/recctrl/rectext.c
@@ -1,65 +1,26 @@
-/*
- * Copyright (C) 1994-1998, Index Data 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: rectext.c,v $
- * Revision 1.9  1998-10-16 08:14:38  adam
- * Updated record control system.
- *
- * 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.15 2002-08-02 19:26:56 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   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 <stdio.h>
 #include <assert.h>
 #include <ctype.h>
@@ -67,11 +28,12 @@
 #include <zebrautl.h>
 #include "rectext.h"
 
-static void text_init (RecType recType)
+static void *text_init (RecType recType)
 {
+    return 0;
 }
 
-static void text_destroy (RecType recType)
+static void text_destroy (void *clientData)
 {
 }
 
@@ -84,10 +46,10 @@ 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;
@@ -114,7 +76,7 @@ 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)
 {
     char w[512];
     RecWord recWord;
@@ -137,14 +99,14 @@ static int text_extract (struct recExtractCtrl *p)
         {
             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;
@@ -157,6 +119,9 @@ static int text_retrieve (struct recRetrieveCtrl *p)
         p->comp->u.simple->which == Z_ElementSetNames_generic)
         elementSetName = p->comp->u.simple->u.generic;
 
+    /* don't make header for the R(aw) element set name */
+    if (elementSetName && !strcmp(elementSetName, "R"))
+        start_flag = 0;
     while (1)
     {
         if (text_ptr + 4096 >= text_size)
@@ -164,7 +129,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);