* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.8 1995-09-28 09:19:47 adam
+ * Revision 1.14 1995-10-09 16:18:37 adam
+ * Function dict_lookup_grep got extra client data parameter.
+ *
+ * Revision 1.13 1995/10/06 14:38:00 adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.12 1995/10/06 13:52:06 adam
+ * Bug fixes. Handler may abort further scanning.
+ *
+ * Revision 1.11 1995/10/06 10:43:57 adam
+ * Scan added. 'occurrences' in scan entries not set yet.
+ *
+ * Revision 1.10 1995/10/02 16:43:32 quinn
+ * Set default resulting record type in fetch.
+ *
+ * Revision 1.9 1995/10/02 15:18:52 adam
+ * New member in recRetrieveCtrl: diagnostic.
+ *
+ * Revision 1.8 1995/09/28 09:19:47 adam
* xfree/xmalloc used everywhere.
* Extract/retrieve method seems to work for text records.
*
#include <fcntl.h>
#include <recctrl.h>
-#include <backend.h>
#include <dmalloc.h>
#include "zserver.h"
r.errstring = "is_open fail: wordisam";
return &r;
}
- server_info.recordBuf = NULL;
+ server_info.odr = odr_createmem (ODR_ENCODE);
return &r;
}
r.errstring = 0;
r.hits = 0;
+ odr_reset (server_info.odr);
+ server_info.errCode = 0;
switch (q->query->which)
{
case Z_Query_type_1:
return read (fd, buf, count);
}
-static int record_fetch (ZServerInfo *zi, int sysno, 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)
{
logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Open record file %s", fname);
exit (1);
}
+ logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
+ retrieveCtrl.localno = sysno;
+ retrieveCtrl.score = score;
retrieveCtrl.odr = stream;
retrieveCtrl.readf = record_read;
- retrieveCtrl.input_format = input_format;
+ retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
+ retrieveCtrl.diagnostic = 0;
(*rt->retrieve)(&retrieveCtrl);
*output_format = retrieveCtrl.output_format;
*rec_bufp = retrieveCtrl.rec_buf;
*rec_lenp = retrieveCtrl.rec_len;
close (retrieveCtrl.fd);
- return 0;
+ return retrieveCtrl.diagnostic;
}
bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
r.last_in_set = 0;
r.basename = "base";
- xfree (server_info.recordBuf);
- server_info.recordBuf = NULL;
+ odr_reset (server_info.odr);
+ server_info.errCode = 0;
+
positions[0] = q->number;
records = resultSetSysnoGet (&server_info, q->setname, 1, positions);
if (!records)
logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
return &r;
}
- r.errcode = record_fetch (&server_info, records[0].sysno, q->stream,
+ r.errcode = record_fetch (&server_info, records[0].sysno,
+ records[0].score, q->stream,
q->format, &r.format, &r.record, &r.len);
return &r;
}
bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num)
{
- static struct scan_entry list[200];
- static char buf[200][200];
static bend_scanresult r;
- int i;
+ int status;
+
+ odr_reset (server_info.odr);
+ server_info.errCode = 0;
+ r.errstring = 0;
r.term_position = q->term_position;
r.num_entries = q->num_entries;
- r.entries = list;
- for (i = 0; i < r.num_entries; i++)
- {
- list[i].term = buf[i];
- sprintf(list[i].term, "term-%d", i+1);
- list[i].occurrences = rand() % 100000;
- }
- r.errcode = 0;
- r.errstring = 0;
+ r.errcode = rpn_scan (&server_info, server_info.odr, q->term,
+ &r.term_position,
+ &r.num_entries, &r.entries, &status);
+ r.status = status;
return &r;
}
dict_close (server_info.wordDict);
is_close (server_info.wordIsam);
close (server_info.sys_idx_fd);
- xfree (server_info.recordBuf);
- server_info.recordBuf = NULL;
return;
}