From 0df6c383d656dba662eb9d9acafed01a0973fcff Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 2 Sep 1998 13:53:16 +0000 Subject: [PATCH] Extra parameter decode added to search routines to implement persistent queries. --- Makefile | 4 ++-- index/zebraapi.c | 12 ++++++++---- index/zebraapi.h | 10 +++++++--- index/zrpn.c | 10 +++++++--- index/zserver.c | 10 +++++++--- index/zserver.h | 10 +++++++--- 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 38a3c40..486a3c1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -# Copyright (C) 1994-1998, Index Data I/S +# Copyright (C) 1994-1998, Index Data # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.62 1998-05-20 10:12:11 adam Exp $ +# $Id: Makefile,v 1.63 1998-09-02 13:53:16 adam Exp $ SHELL=/bin/sh MAKE=make diff --git a/index/zebraapi.c b/index/zebraapi.c index 30e84a7..54e01a5 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -1,10 +1,14 @@ /* - * Copyright (C) 1995-1998, Index Data ApS + * Copyright (C) 1995-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.c,v $ - * Revision 1.8 1998-08-24 17:29:23 adam + * Revision 1.9 1998-09-02 13:53:17 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.8 1998/08/24 17:29:23 adam * Minor changes. * * Revision 1.7 1998/06/24 12:16:13 adam @@ -218,7 +222,7 @@ void zebra_close (ZebraHandle zh) xfree (zh); } -void zebra_search_rpn (ZebraHandle zh, ODR stream, +void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *query, int num_bases, char **basenames, const char *setname) { @@ -226,7 +230,7 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, zh->errCode = 0; zh->errString = NULL; zh->hits = 0; - rpn_search (zh, stream, query, num_bases, basenames, setname); + rpn_search (zh, stream, decode, query, num_bases, basenames, setname); zebra_register_unlock (zh); } diff --git a/index/zebraapi.h b/index/zebraapi.h index f05541a..329c9cf 100644 --- a/index/zebraapi.h +++ b/index/zebraapi.h @@ -1,10 +1,14 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zebraapi.h,v $ - * Revision 1.3 1998-06-22 11:36:48 adam + * Revision 1.4 1998-09-02 13:53:18 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.3 1998/06/22 11:36:48 adam * Added authentication check facility to zebra. * * Revision 1.2 1998/06/13 00:14:09 adam @@ -42,7 +46,7 @@ typedef struct zebra_info *ZebraHandle; YAZ_EXPORT ZebraHandle zebra_open (const char *configName); /* Search using RPN-Query */ -YAZ_EXPORT void zebra_search_rpn (ZebraHandle zh, ODR stream, +YAZ_EXPORT void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *query, int num_bases, char **basenames, const char *setname); diff --git a/index/zrpn.c b/index/zrpn.c index c5da516..e7580a1 100644 --- a/index/zrpn.c +++ b/index/zrpn.c @@ -1,10 +1,14 @@ /* - * Copyright (C) 1995-1998, Index Data I/S + * Copyright (C) 1995-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zrpn.c,v $ - * Revision 1.82 1998-06-26 11:16:40 quinn + * Revision 1.83 1998-09-02 13:53:19 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.82 1998/06/26 11:16:40 quinn * Added support (un-optimised) for left and left/right truncation * * Revision 1.81 1998/06/24 12:16:14 adam @@ -2013,7 +2017,7 @@ static RSET rpn_search_structure (ZebraHandle zh, Z_RPNStructure *zs, return r; } -void rpn_search (ZebraHandle zh, ODR stream, +void rpn_search (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname) { diff --git a/index/zserver.c b/index/zserver.c index fb72949..e3115d6 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,14 @@ /* - * Copyright (C) 1995-1998, Index Data I/S + * Copyright (C) 1995-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.62 1998-08-06 14:35:28 adam + * Revision 1.63 1998-09-02 13:53:21 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.62 1998/08/06 14:35:28 adam * Routine bend_deleterequest removed. * * Revision 1.61 1998/06/24 12:16:15 adam @@ -303,7 +307,7 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) switch (q->query->which) { case Z_Query_type_1: case Z_Query_type_101: - zebra_search_rpn (zh, q->stream, q->query->u.type_1, + zebra_search_rpn (zh, q->stream, q->decode, q->query->u.type_1, q->num_bases, q->basenames, q->setname); r->errcode = zh->errCode; r->errstring = zh->errString; diff --git a/index/zserver.h b/index/zserver.h index 51b59bb..eab2450 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,10 +1,14 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1998, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.36 1998-06-24 12:16:16 adam + * Revision 1.37 1998-09-02 13:53:22 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.36 1998/06/24 12:16:16 adam * Support for relations on text operands. Open range support in * DFA module (i.e. [-j], [g-]). * @@ -204,7 +208,7 @@ struct rank_control { void (*add)(void *set_handle, int seqno, int term_index); }; -void rpn_search (ZebraHandle zh, ODR stream, +void rpn_search (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *rpn, int num_bases, char **basenames, const char *setname); -- 1.7.10.4