X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsgmlread.c;h=38fcbe3026ebb39ea2475ff856d41b9f82ff1ddf;hb=a741f3ed46c75118dd042c30b375c9cea923b33e;hp=83d98d564482e72ee76b32836edb274b55337761;hpb=4478d785b7769691261005c98063b98a5a5971b3;p=idzebra-moved-to-github.git

diff --git a/index/sgmlread.c b/index/sgmlread.c
index 83d98d5..38fcbe3 100644
--- a/index/sgmlread.c
+++ b/index/sgmlread.c
@@ -1,8 +1,5 @@
-/* $Id: sgmlread.c,v 1.2 2006-08-14 10:40:15 adam Exp $
-   Copyright (C) 1995-2006
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 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
@@ -31,9 +28,8 @@ struct sgml_getc_info {
     int buf_size;
     int size;
     int off;
+    struct ZebraRecStream *stream;
     off_t moffset;
-    void *fh;
-    int (*readf)(void *, char *, size_t);
     WRBUF wrbuf;
 };
 
@@ -49,7 +45,7 @@ int sgml_getc (void *clientData)
     p->moffset += p->off;
     p->off = 0;
     p->size = 0;
-    res = (*p->readf)(p->fh, p->buf, p->buf_size);
+    res = p->stream->readf(p->stream, p->buf, p->buf_size);
     if (res > 0)
     {
 	p->size += res;
@@ -64,19 +60,21 @@ static data1_node *grs_read_sgml (struct grs_read_info *p)
     data1_node *node;
     int res;
     
-    sgi->moffset = p->offset;
-    sgi->fh = p->fh;
-    sgi->readf = p->readf;
+    sgi->moffset = p->stream->tellf(p->stream);
+    sgi->stream = p->stream;
     sgi->off = 0;
     sgi->size = 0;
-    res = (*sgi->readf)(sgi->fh, sgi->buf, sgi->buf_size);
+    res = sgi->stream->readf(sgi->stream, sgi->buf, sgi->buf_size);
     if (res > 0)
 	sgi->size += res;
     else
 	return 0;
-    node = data1_read_nodex (p->dh, p->mem, sgml_getc, sgi, sgi->wrbuf);
-    if (node && p->endf)
-	(*p->endf)(sgi->fh, sgi->moffset + sgi->off);
+    node = data1_read_nodex(p->dh, p->mem, sgml_getc, sgi, sgi->wrbuf);
+    if (node && p->stream->endf)
+    {
+        off_t end_offset = sgi->moffset + sgi->off;
+	p->stream->endf(sgi->stream, &end_offset);
+    }
     return node;
 }
 
@@ -98,9 +96,9 @@ static void grs_destroy_sgml(void *clientData)
 {
     struct sgml_getc_info *p = (struct sgml_getc_info *) clientData;
 
-    wrbuf_free(p->wrbuf, 1);
-    xfree (p->buf);
-    xfree (p);
+    wrbuf_destroy(p->wrbuf);
+    xfree(p->buf);
+    xfree(p);
 }
 
 static int grs_extract_sgml(void *clientData, struct recExtractCtrl *ctrl)