Update for YAZ 3s new OID system

[idzebra-moved-to-github.git] / index / safari.c

diff --git a/index/safari.c b/index/safari.c
index 8327bda..41cad30 100644 (file)
--- a/index/safari.c
+++ b/index/safari.c
@@ -1,5 +1,5 @@
-/* $Id: safari.c,v 1.3 2006-08-16 13:16:36 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: safari.c,v 1.6 2007-04-16 08:44:32 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-
+#include <yaz/oid_db.h>
 #include <stdio.h>
 #include <assert.h>
 #include <ctype.h>
@@ -81,7 +81,7 @@ static int fi_getchar(struct fi_info *fi, char *dst)
     {
         if (fi->max <= 0)
             return 0;
-        fi->max = (*fi->p->readf)(fi->p->fh, fi->buf, 4096);
+        fi->max = fi->p->stream->readf(fi->p->stream, fi->buf, 4096);
         fi->offset = 0;
         if (fi->max <= 0)
             return 0;
@@ -236,7 +236,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
         }
        if (!make_body)
            break;
-        r = (*p->readf)(p->fh, filter_buf + filter_ptr, 4096);
+        r = p->stream->readf(p->stream, filter_buf + filter_ptr, 4096);
         if (r <= 0)
             break;
         filter_ptr += r;
@@ -262,7 +262,7 @@ static int filter_retrieve (void *clientData, struct recRetrieveCtrl *p)
             filter_ptr = p-filter_buf;
         }
     }
-    p->output_format = VAL_SUTRS;
+    p->output_format = yaz_oid_sutrs();
     p->rec_buf = filter_buf;
     p->rec_len = filter_ptr; 
     return 0;