* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.23 1995-11-16 17:00:56 adam
+ * Revision 1.29 1995-12-04 14:22:32 adam
+ * Extra arg to recType_byName.
+ * Started work on new regular expression parsed input to
+ * structured records.
+ *
+ * Revision 1.28 1995/11/28 09:09:48 adam
+ * Zebra config renamed.
+ * Use setting 'recordId' to identify record now.
+ * Bug fix in recindex.c: rec_release_blocks was invokeded even
+ * though the blocks were already released.
+ * File traversal properly deletes records when needed.
+ *
+ * Revision 1.27 1995/11/27 13:58:54 adam
+ * New option -t. storeStore data implemented in server.
+ *
+ * Revision 1.26 1995/11/25 10:24:07 adam
+ * More record fields - they are enumerated now.
+ * New options: flagStoreData flagStoreKey.
+ *
+ * Revision 1.25 1995/11/21 15:29:13 adam
+ * Config file 'base' read by default by both indexer and server.
+ *
+ * Revision 1.24 1995/11/20 16:59:47 adam
+ * New update method: the 'old' keys are saved for each records.
+ *
+ * Revision 1.23 1995/11/16 17:00:56 adam
* Better logging of rpn query.
*
* Revision 1.22 1995/11/16 15:34:55 adam
r.handle = name;
logf (LOG_DEBUG, "bend_init");
- data1_tabpath = res_get(common_resource, "data1_tabpath");
- server_info.sets = NULL;
-#if RECORD_BASE
- server_info.records = rec_open (0);
-#else
- if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY)))
+
+ if (!common_resource)
{
- logf (LOG_WARN|LOG_ERRNO, "sys_idx open fail");
- r.errcode = 1;
- r.errstring = "sys_idx open fail";
- return &r;
+ struct statserv_options_block *sob;
+
+ sob = statserv_getcontrol ();
+ logf (LOG_LOG, "Reading resources from %s", sob->configname);
+ if (!(common_resource = res_open (sob->configname)))
+ {
+ logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname);
+ exit (1);
+ }
}
-#endif
- if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 10, 0)))
- {
- logf (LOG_WARN, "dict_open fail: fname dict");
- r.errcode = 1;
- r.errstring = "dict_open fail: fname dict";
- return &r;
- }
+
+ data1_tabpath = res_get(common_resource, "profilePath");
+ server_info.sets = NULL;
+
+ server_info.records = rec_open (0);
if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0)))
{
logf (LOG_WARN, "dict_open fail: word dict");
- dict_close (server_info.fileDict);
r.errcode = 1;
r.errstring = "dict_open fail: word dict";
return &r;
{
logf (LOG_WARN, "is_open fail: word isam");
dict_close (server_info.wordDict);
- dict_close (server_info.fileDict);
r.errcode = 1;
r.errstring = "is_open fail: word isam";
return &r;
return &r;
}
-static int record_read (int fd, char *buf, size_t count)
+static int record_ext_read (int fd, char *buf, size_t count)
{
return read (fd, buf, count);
}
+static int record_int_pos;
+static char *record_int_buf;
+static int record_int_len;
+
+static int record_int_read (int fd, char *buf, size_t count)
+{
+ int l = record_int_len - record_int_pos;
+ if (l <= 0)
+ return 0;
+ l = (l < count) ? l : count;
+ memcpy (buf, record_int_buf + record_int_pos, l);
+ record_int_pos += l;
+ return l;
+}
+
static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream,
oid_value input_format, Z_RecordComposition *comp,
oid_value *output_format, char **rec_bufp,
int *rec_lenp)
{
-#if RECORD_BASE
Record rec;
-#else
- char record_info[SYS_IDX_ENTRY_LEN];
-#endif
char *fname, *file_type;
RecType rt;
struct recRetrieveCtrl retrieveCtrl;
+ char subType[128];
-#if RECORD_BASE
rec = rec_get (zi->records, sysno);
- file_type = rec->info[0];
- fname = rec->info[1];
-#else
- if (lseek (zi->sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN,
- SEEK_SET) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "Retrieve: lseek of sys_idx");
- exit (1);
- }
- if (read (zi->sys_idx_fd, record_info, SYS_IDX_ENTRY_LEN) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "Retrieve: read of sys_idx");
- exit (1);
- }
- file_type = record_info;
- fname = record_info + strlen(record_info) + 1;
-#endif
+ file_type = rec->info[recInfo_fileType];
+ fname = rec->info[recInfo_filename];
- if (!(rt = recType_byName (file_type)))
+ if (!(rt = recType_byName (file_type, subType)))
{
logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s",
file_type);
exit (1);
}
logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score);
- if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1)
+ if (rec->size[recInfo_storeData] > 0)
{
- char *msg = "Record doesn't exist";
- logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname);
- *output_format = VAL_SUTRS;
- *rec_bufp = msg;
- *rec_lenp = strlen (msg);
-#if RECORD_BASE
- rec_rm (rec);
-#endif
- return 0; /* or 14: System error in presenting records */
+ retrieveCtrl.readf = record_int_read;
+ record_int_len = rec->size[recInfo_storeData];
+ record_int_buf = rec->info[recInfo_storeData];
+ record_int_pos = 0;
+ logf (LOG_DEBUG, "Internal retrieve. %d bytes", record_int_len);
}
+ else
+ {
+ if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1)
+ {
+ char *msg = "Record doesn't exist";
+ logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname);
+ *output_format = VAL_SUTRS;
+ *rec_bufp = msg;
+ *rec_lenp = strlen (msg);
+ rec_rm (&rec);
+ return 0; /* or 14: System error in presenting records */
+ }
+ retrieveCtrl.readf = record_ext_read;
+ }
+ retrieveCtrl.subType = subType;
retrieveCtrl.localno = sysno;
retrieveCtrl.score = score;
retrieveCtrl.odr = stream;
- retrieveCtrl.readf = record_read;
retrieveCtrl.input_format = retrieveCtrl.output_format = input_format;
retrieveCtrl.comp = comp;
retrieveCtrl.diagnostic = 0;
*rec_bufp = retrieveCtrl.rec_buf;
*rec_lenp = retrieveCtrl.rec_len;
close (retrieveCtrl.fd);
-#if RECORD_BASE
- rec_rm (rec);
-#endif
+ rec_rm (&rec);
+
return retrieveCtrl.diagnostic;
}
void bend_close (void *handle)
{
- dict_close (server_info.fileDict);
dict_close (server_info.wordDict);
is_close (server_info.wordIsam);
-#if RECORD_BASE
rec_close (&server_info.records);
-#else
- close (server_info.sys_idx_fd);
-#endif
return;
}
int main (int argc, char **argv)
{
- char *base_name = "base";
+ struct statserv_options_block *sob;
+
+ sob = statserv_getcontrol ();
+ strcpy (sob->configname, FNAME_CONFIG);
+ statserv_setcontrol (sob);
- if (!(common_resource = res_open (base_name)))
- {
- logf (LOG_FATAL, "Cannot open resource `%s'", base_name);
- exit (1);
- }
return statserv_main (argc, argv);
}
projects / idzebra-moved-to-github.git / blobdiff