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
More work on retrieve.
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
204f5e4
..
e1413f2
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.5 1995-09-06 16:11:18 adam
+ * Revision 1.7 1995-09-27 16:17:32 adam
+ * More work on retrieve.
+ *
+ * Revision 1.6 1995/09/08 08:53:22 adam
+ * Record buffer maintained in server_info.
+ *
+ * Revision 1.5 1995/09/06 16:11:18 adam
* Option: only one word key per file.
*
* Revision 1.4 1995/09/06 10:33:04 adam
* Option: only one word key per file.
*
* Revision 1.4 1995/09/06 10:33:04 adam
@@
-72,6
+78,7
@@
bend_initresult *bend_init (bend_initrequest *q)
r.errstring = "is_open fail: wordisam";
return &r;
}
r.errstring = "is_open fail: wordisam";
return &r;
}
+ server_info.recordBuf = NULL;
return &r;
}
return &r;
}
@@
-100,32
+107,36
@@
bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num)
{
static bend_fetchresult r;
int positions[2];
{
static bend_fetchresult r;
int positions[2];
- ZServerRecord *records;
+ ZServerSetSysno *records;
r.errstring = 0;
r.last_in_set = 0;
r.basename = "base";
r.errstring = 0;
r.last_in_set = 0;
r.basename = "base";
+ xfree (server_info.recordBuf);
+ server_info.recordBuf = NULL;
positions[0] = q->number;
positions[0] = q->number;
- records = resultSetRecordGet (&server_info, q->setname, 1, positions);
+ records = resultSetSysnoGet (&server_info, q->setname, 1, positions);
if (!records)
{
logf (LOG_DEBUG, "resultSetRecordGet, error");
r.errcode = 13;
return &r;
}
if (!records)
{
logf (LOG_DEBUG, "resultSetRecordGet, error");
r.errcode = 13;
return &r;
}
- if (!records[0].buf)
+ if (!records[0].sysno)
{
r.errcode = 13;
logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
return &r;
}
{
r.errcode = 13;
logf (LOG_DEBUG, "Out of range. pos=%d", q->number);
return &r;
}
+#if 0
r.len = records[0].size;
r.len = records[0].size;
- r.record = malloc (r.len+1);
+ server_info.recordBuf = r.record = xmalloc (r.len+1);
strcpy (r.record, records[0].buf);
resultSetRecordDel (&server_info, records, 1);
r.format = VAL_SUTRS;
r.errcode = 0;
strcpy (r.record, records[0].buf);
resultSetRecordDel (&server_info, records, 1);
r.format = VAL_SUTRS;
r.errcode = 0;
+#endif
return &r;
}
return &r;
}
@@
-161,6
+172,8
@@
void bend_close (void *handle)
dict_close (server_info.wordDict);
is_close (server_info.wordIsam);
close (server_info.sys_idx_fd);
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;
}
return;
}