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
New feature: databases. Implemented as prefix to words in dictionary.
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
a88cecd
..
07f5961
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.17 1995-10-16 09:32:40 adam
+ * Revision 1.19 1995-10-17 18:02:11 adam
+ * New feature: databases. Implemented as prefix to words in dictionary.
+ *
+ * Revision 1.18 1995/10/16 14:03:09 quinn
+ * Changes to support element set names and espec1
+ *
+ * Revision 1.17 1995/10/16 09:32:40 adam
* More work on relational op.
*
* Revision 1.16 1995/10/13 12:26:44 adam
* More work on relational op.
*
* Revision 1.16 1995/10/13 12:26:44 adam
@@
-147,8
+153,9
@@
static int record_read (int fd, char *buf, size_t count)
}
static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
}
static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
- oid_value input_format, oid_value *output_format,
- char **rec_bufp, int *rec_lenp)
+ oid_value input_format, Z_RecordComposition *comp,
+ oid_value *output_format, char **rec_bufp,
+ int *rec_lenp)
{
char record_info[SYS_IDX_ENTRY_LEN];
char *fname, *file_type;
{
char record_info[SYS_IDX_ENTRY_LEN];
char *fname, *file_type;
@@
-189,6
+196,7
@@
static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
retrieveCtrl.odr = stream;
retrieveCtrl.readf = record_read;
retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
retrieveCtrl.odr = stream;
retrieveCtrl.readf = record_read;
retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
+ retrieveCtrl.comp = comp;
retrieveCtrl.diagnostic = 0;
(*rt->retrieve)(&retrieveCtrl);
*output_format = retrieveCtrl.output_format;
retrieveCtrl.diagnostic = 0;
(*rt->retrieve)(&retrieveCtrl);
*output_format = retrieveCtrl.output_format;
@@
-226,8
+234,9
@@
bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
return &r;
}
r.errcode = record_fetch (&server_info, records[0].sysno,
return &r;
}
r.errcode = record_fetch (&server_info, records[0].sysno,
- records[0].score, q->stream,
- q->format, &r.format, &r.record, &r.len);
+ records[0].score, q->stream, q->format,
+ q->comp, &r.format, &r.record, &r.len);
+ resultSetSysnoDel (&server_info, records, 1);
return &r;
}
return &r;
}
@@
-248,6
+257,7
@@
bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
r.term_position = q->term_position;
r.num_entries = q->num_entries;
r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
r.term_position = q->term_position;
r.num_entries = q->num_entries;
r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
+ q->num_bases, q->basenames,
&r.term_position,
&r.num_entries, &r.entries, &status);
r.status = status;
&r.term_position,
&r.num_entries, &r.entries, &status);
r.status = status;