projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added autoconf utility idzebra.m4 which defines --with-idzebra
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
c6dad72
..
996c31e
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,4
+1,4
@@
-/* $Id: zserver.c,v 1.117 2004-08-02 10:12:06 adam Exp $
+/* $Id: zserver.c,v 1.122 2004-08-25 09:28:01 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-170,15
+170,16
@@
bend_initresult *bend_init (bend_initrequest *q)
static void search_terms (ZebraHandle zh, bend_search_rr *r)
{
static void search_terms (ZebraHandle zh, bend_search_rr *r)
{
- int count;
+ zint count = 0;
int no_terms;
int i;
int no_terms;
int i;
- int type;
+ int type = Z_Term_general;
struct Z_External *ext;
Z_SearchInfoReport *sr;
/* get no of terms for result set */
struct Z_External *ext;
Z_SearchInfoReport *sr;
/* get no of terms for result set */
- no_terms = zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0);
+ no_terms = 0; /* zebra_resultSetTerms (zh, r->setname, 0, 0, 0, 0, 0); */
+ /* FIXME - Rsets don't know number of terms no more ??? */
if (!no_terms)
return;
if (!no_terms)
return;
@@
-208,9
+209,11
@@
static void search_terms (ZebraHandle zh, bend_search_rr *r)
Z_Term *term;
char outbuf[1024];
size_t len = sizeof(outbuf);
Z_Term *term;
char outbuf[1024];
size_t len = sizeof(outbuf);
+ /* FIXME - Can we just skip this ??? */
+ /*
zebra_resultSetTerms (zh, r->setname, i,
&count, &type, outbuf, &len);
zebra_resultSetTerms (zh, r->setname, i,
&count, &type, outbuf, &len);
-
+ */
sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements));
sr->elements[i]->subqueryId = 0;
sr->elements[i]->fullQuery = odr_malloc (r->stream,
sr->elements[i] = odr_malloc (r->stream, sizeof(**sr->elements));
sr->elements[i]->subqueryId = 0;
sr->elements[i]->fullQuery = odr_malloc (r->stream,
@@
-246,7
+249,9
@@
static void search_terms (ZebraHandle zh, bend_search_rr *r)
sr->elements[i]->subqueryExpression->u.term->termComment = 0;
sr->elements[i]->subqueryInterpretation = 0;
sr->elements[i]->subqueryRecommendation = 0;
sr->elements[i]->subqueryExpression->u.term->termComment = 0;
sr->elements[i]->subqueryInterpretation = 0;
sr->elements[i]->subqueryRecommendation = 0;
- sr->elements[i]->subqueryCount = odr_intdup (r->stream, count);
+ if (count > 2000000000)
+ count = 2000000000;
+ sr->elements[i]->subqueryCount = odr_intdup (r->stream, (int) count);
sr->elements[i]->subqueryWeight = 0;
sr->elements[i]->resultsByDB = 0;
}
sr->elements[i]->subqueryWeight = 0;
sr->elements[i]->resultsByDB = 0;
}
@@
-542,7
+547,7
@@
int bend_esrequest (void *handle, bend_esrequest_rr *rr)
Z_External *rec = notToKeep->elements[i]->record;
struct oident *oident = 0;
Odr_oct *opaque_recid = 0;
Z_External *rec = notToKeep->elements[i]->record;
struct oident *oident = 0;
Odr_oct *opaque_recid = 0;
- int sysno = 0;
+ SYSNO sysno = 0;
if (notToKeep->elements[i]->u.opaque)
{
if (notToKeep->elements[i]->u.opaque)
{