* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.44 1996-12-11 12:08:01 adam
+ * Revision 1.47 1997-09-04 13:58:36 adam
+ * New retrieve/extract method tellf (added).
+ * Added O_BINARY for open calls.
+ *
+ * Revision 1.46 1997/07/28 08:30:47 adam
+ * Server returns diagnostic 14 when record doesn't exist.
+ *
+ * Revision 1.45 1996/12/23 15:30:45 adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.44 1996/12/11 12:08:01 adam
* Added better compression.
*
* Revision 1.43 1996/11/15 15:03:58 adam
#include <recctrl.h>
#include <dmalloc.h>
+#define USE_TIMES 1
#ifdef __linux__
#define USE_TIMES 1
#endif
return lseek (*((int*) fh), offset + record_offset, SEEK_SET);
}
+static off_t record_ext_tell (void *fh)
+{
+ return lseek (*((int*) fh), 0, SEEK_CUR) - record_offset;
+}
+
static int record_int_pos;
static char *record_int_buf;
static int record_int_len;
return (off_t) (record_int_pos = offset);
}
+static off_t record_int_tell (void *fh)
+{
+ return (off_t) record_int_pos;
+}
+
static int record_int_read (void *fh, char *buf, size_t count)
{
int l = record_int_len - record_int_pos;
rec = rec_get (zi->records, sysno);
if (!rec)
{
- char *msg = "Record is deleted\n";
- *output_format = VAL_SUTRS;
- *rec_bufp = msg;
- *rec_lenp = strlen (msg);
logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno);
- return 0;
+ return 14;
}
file_type = rec->info[recInfo_fileType];
fname = rec->info[recInfo_filename];
{
retrieveCtrl.readf = record_int_read;
retrieveCtrl.seekf = record_int_seek;
+ retrieveCtrl.tellf = record_int_tell;
record_int_len = rec->size[recInfo_storeData];
record_int_buf = rec->info[recInfo_storeData];
record_int_pos = 0;
}
else
{
- if ((fd = open (fname, O_RDONLY)) == -1)
+ if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1)
{
- char *msg = "Record doesn't exist\n";
- logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname);
- *output_format = VAL_SUTRS;
- *rec_bufp = msg;
- *rec_lenp = strlen (msg);
+ logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s",
+ fname);
rec_rm (&rec);
- return 0; /* or 14: System error in presenting records */
+ return 14;
}
-
memcpy (&record_offset, rec->info[recInfo_offset],
sizeof(record_offset));
retrieveCtrl.fh = &fd;
retrieveCtrl.readf = record_ext_read;
retrieveCtrl.seekf = record_ext_seek;
+ retrieveCtrl.tellf = record_ext_tell;
record_ext_seek (retrieveCtrl.fh, 0);
}
{
if (server_info.records)
{
+ resultSetDestroy (&server_info);
dict_close (server_info.dict);
if (server_info.isam)
is_close (server_info.isam);