X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fsgmlread.c;h=dd9167e5c13d906f221c822897b7ea84f9cc931d;hb=ecb3935e78cd9bcfdebafdee0834cfb1060d7b5e;hp=c22cd51ba2f7d124ed36f13af6bfd14a9975391e;hpb=896c0427df9d8eff5de6a1735dcd992e067df844;p=idzebra-moved-to-github.git

diff --git a/recctrl/sgmlread.c b/recctrl/sgmlread.c
index c22cd51..dd9167e 100644
--- a/recctrl/sgmlread.c
+++ b/recctrl/sgmlread.c
@@ -1,6 +1,6 @@
-/* $Id: sgmlread.c,v 1.11 2002-08-02 19:26:56 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
-   Index Data Aps
+/* $Id: sgmlread.c,v 1.20 2006-05-10 08:13:31 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -24,14 +24,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <assert.h>
 #include <yaz/log.h>
 
-#include "grsread.h"
+#include <idzebra/recgrs.h>
 
 struct sgml_getc_info {
     char *buf;
     int buf_size;
     int size;
     int off;
-    int moffset;
+    off_t moffset;
     void *fh;
     int (*readf)(void *, char *, size_t);
     WRBUF wrbuf;
@@ -80,7 +80,7 @@ static data1_node *grs_read_sgml (struct grs_read_info *p)
     return node;
 }
 
-static void *grs_init_sgml(void)
+static void *grs_init_sgml(Res res, RecType recType)
 {
     struct sgml_getc_info *p = (struct sgml_getc_info *) xmalloc (sizeof(*p));
     p->buf_size = 512;
@@ -89,6 +89,11 @@ static void *grs_init_sgml(void)
     return p;
 }
 
+static ZEBRA_RES grs_config_sgml(void *clientData, Res res, const char *args)
+{
+    return ZEBRA_OK;
+}
+
 static void grs_destroy_sgml(void *clientData)
 {
     struct sgml_getc_info *p = (struct sgml_getc_info *) clientData;
@@ -98,12 +103,43 @@ static void grs_destroy_sgml(void *clientData)
     xfree (p);
 }
 
-static struct recTypeGrs sgml_type = {
-    "sgml",
+static int grs_extract_sgml(void *clientData, struct recExtractCtrl *ctrl)
+{
+    return zebra_grs_extract(clientData, ctrl, grs_read_sgml);
+}
+
+static int grs_retrieve_sgml(void *clientData, struct recRetrieveCtrl *ctrl)
+{
+    return zebra_grs_retrieve(clientData, ctrl, grs_read_sgml);
+}
+
+static struct recType grs_type_sgml =
+{
+    0,
+    "grs.sgml",
     grs_init_sgml,
+    grs_config_sgml,
     grs_destroy_sgml,
-    grs_read_sgml
+    grs_extract_sgml,
+    grs_retrieve_sgml
 };
 
-RecTypeGrs recTypeGrs_sgml = &sgml_type;
+RecType
+#ifdef IDZEBRA_STATIC_GRS_SGML
+idzebra_filter_grs_sgml
+#else
+idzebra_filter
+#endif
+
+[] = {
+    &grs_type_sgml,
+    0,
+};
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */