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
minor
[idzebra-moved-to-github.git]
/
index
/
extract.c
diff --git
a/index/extract.c
b/index/extract.c
index
b08d3bb
..
ce51945
100644
(file)
--- a/
index/extract.c
+++ b/
index/extract.c
@@
-3,7
+3,7
@@
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
- * $Id: extract.c,v 1.111 2002-02-20 23:07:54 adam Exp $
+ * $Id: extract.c,v 1.117 2002-04-15 14:05:43 adam Exp $
*/
#include <stdio.h>
#include <assert.h>
*/
#include <stdio.h>
#include <assert.h>
@@
-14,12
+14,9
@@
#endif
#include <fcntl.h>
#endif
#include <fcntl.h>
-#include <recctrl.h>
-#include <charmap.h>
-#include <sortidx.h>
#include "index.h"
#include "index.h"
-#include "zserver.h"
-#include "zinfo.h"
+#include <direntz.h>
+#include <charmap.h>
#if _FILE_OFFSET_BITS == 64
#define PRINTF_OFF_T "%Ld"
#if _FILE_OFFSET_BITS == 64
#define PRINTF_OFF_T "%Ld"
@@
-27,35
+24,21
@@
#define PRINTF_OFF_T "%ld"
#endif
#define PRINTF_OFF_T "%ld"
#endif
-#ifndef ZEBRASDR
-#define ZEBRASDR 0
-#endif
-
-#if ZEBRASDR
-#include "zebrasdr.h"
-#endif
-
-static int records_inserted = 0;
-static int records_updated = 0;
-static int records_deleted = 0;
-static int records_processed = 0;
-
-static void logRecord (int showFlag)
+static void logRecord (ZebraHandle zh)
{
{
- if (!showFlag)
- ++records_processed;
- if (showFlag || !(records_processed % 1000))
+ ++zh->records_processed;
+ if (!(zh->records_processed % 1000))
{
logf (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
{
logf (LOG_LOG, "Records: %7d i/u/d %d/%d/%d",
- records_processed, records_inserted, records_updated,
- records_deleted);
+ zh->records_processed, zh->records_inserted, zh->records_updated,
+ zh->records_deleted);
}
}
static void extract_init (struct recExtractCtrl *p, RecWord *w)
{
w->zebra_maps = p->zebra_maps;
}
}
static void extract_init (struct recExtractCtrl *p, RecWord *w)
{
w->zebra_maps = p->zebra_maps;
- w->seqnos = p->seqno;
+ w->seqno = 1;
w->attrSet = VAL_BIB1;
w->attrUse = 1016;
w->reg_type = 'w';
w->attrSet = VAL_BIB1;
w->attrUse = 1016;
w->reg_type = 'w';
@@
-82,7
+65,7
@@
static const char **searchRecordKey (ZebraHandle zh,
ws[i] = NULL;
#if SU_SCHEME
ws[i] = NULL;
#if SU_SCHEME
- chS = zebraExplain_lookupSU (zh->service->zei, attrSetS, attrUseS);
+ chS = zebraExplain_lookupSU (zh->reg->zei, attrSetS, attrUseS);
if (chS < 0)
return ws;
#endif
if (chS < 0)
return ws;
#endif
@@
-232,7
+215,7
@@
static void file_end (void *handle, off_t offset)
p->file_moffset = offset;
}
p->file_moffset = offset;
}
-static char *fileMatchStr (ZebraHandle zh,
+static char *fileMatchStr (ZebraHandle zh,
struct recKeys *reckeys, struct recordGroup *rGroup,
const char *fname, const char *spec)
{
struct recKeys *reckeys, struct recordGroup *rGroup,
const char *fname, const char *spec)
{
@@
-271,11
+254,11
@@
static char *fileMatchStr (ZebraHandle zh,
attname_str[i] = '\0';
}
attname_str[i] = '\0';
}
- if ((attset = data1_get_attset (zh->service->dh, attset_str)))
+ if ((attset = data1_get_attset (zh->reg->dh, attset_str)))
{
data1_att *att;
attSet = attset->reference;
{
data1_att *att;
attSet = attset->reference;
- att = data1_getattbyname(zh->service->dh, attset, attname_str);
+ att = data1_getattbyname(zh->reg->dh, attset, attname_str);
if (att)
attUse = att->value;
else
if (att)
attUse = att->value;
else
@@
-422,10
+405,11
@@
static int recordExtract (ZebraHandle zh,
/* we are going to read from a file, so prepare the extraction */
int i;
/* we are going to read from a file, so prepare the extraction */
int i;
- zh->keys.buf_used = 0;
- zh->keys.prevAttrUse = -1;
- zh->keys.prevAttrSet = -1;
- zh->keys.prevSeqNo = 0;
+ zh->reg->keys.buf_used = 0;
+ zh->reg->keys.prevAttrUse = -1;
+ zh->reg->keys.prevAttrSet = -1;
+ zh->reg->keys.prevSeqNo = 0;
+ zh->reg->sortKeys = 0;
recordOffset = fi->file_moffset;
extractCtrl.offset = fi->file_moffset;
recordOffset = fi->file_moffset;
extractCtrl.offset = fi->file_moffset;
@@
-438,16
+422,16
@@
static int recordExtract (ZebraHandle zh,
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
- extractCtrl.dh = zh->service->dh;
+ extractCtrl.dh = zh->reg->dh;
extractCtrl.handle = zh;
for (i = 0; i<256; i++)
{
extractCtrl.handle = zh;
for (i = 0; i<256; i++)
{
- if (zebra_maps_is_positioned(zh->service->zebra_maps, i))
+ if (zebra_maps_is_positioned(zh->reg->zebra_maps, i))
extractCtrl.seqno[i] = 1;
else
extractCtrl.seqno[i] = 0;
}
extractCtrl.seqno[i] = 1;
else
extractCtrl.seqno[i] = 0;
}
- extractCtrl.zebra_maps = zh->service->zebra_maps;
+ extractCtrl.zebra_maps = zh->reg->zebra_maps;
extractCtrl.flagShowRecords = !rGroup->flagRw;
if (!rGroup->flagRw)
extractCtrl.flagShowRecords = !rGroup->flagRw;
if (!rGroup->flagRw)
@@
-468,14
+452,14
@@
static int recordExtract (ZebraHandle zh,
{
/* error occured during extraction ... */
if (rGroup->flagRw &&
{
/* error occured during extraction ... */
if (rGroup->flagRw &&
- records_processed < rGroup->fileVerboseLimit)
+ zh->records_processed < rGroup->fileVerboseLimit)
{
logf (LOG_WARN, "fail %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
}
return 0;
}
{
logf (LOG_WARN, "fail %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
}
return 0;
}
- if (zh->keys.buf_used == 0)
+ if (zh->reg->keys.buf_used == 0)
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
@@
-499,11
+483,11
@@
static int recordExtract (ZebraHandle zh,
{
char *rinfo;
{
char *rinfo;
- matchStr = fileMatchStr (zh, &zh->keys, rGroup, fname,
+ matchStr = fileMatchStr (zh, &zh->reg->keys, rGroup, fname,
rGroup->recordId);
if (matchStr)
{
rGroup->recordId);
if (matchStr)
{
- rinfo = dict_lookup (zh->service->matchDict, matchStr);
+ rinfo = dict_lookup (zh->reg->matchDict, matchStr);
if (rinfo)
memcpy (sysno, rinfo+1, sizeof(*sysno));
}
if (rinfo)
memcpy (sysno, rinfo+1, sizeof(*sysno));
}
@@
-525,47
+509,47
@@
static int recordExtract (ZebraHandle zh,
logf (LOG_WARN, "cannot delete record above (seems new)");
return 1;
}
logf (LOG_WARN, "cannot delete record above (seems new)");
return 1;
}
- if (records_processed < rGroup->fileVerboseLimit)
+ if (zh->records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "add %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
logf (LOG_LOG, "add %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
- rec = rec_new (zh->service->records);
+ rec = rec_new (zh->reg->records);
*sysno = rec->sysno;
*sysno = rec->sysno;
- recordAttr = rec_init_attr (zh->service->zei, rec);
+ recordAttr = rec_init_attr (zh->reg->zei, rec);
if (matchStr)
{
if (matchStr)
{
- dict_insert (zh->service->matchDict, matchStr, sizeof(*sysno), sysno);
+ dict_insert (zh->reg->matchDict, matchStr, sizeof(*sysno), sysno);
}
}
- extract_flushRecordKeys (zh, *sysno, 1, &zh->keys);
- extract_flushSortKeys (zh, *sysno, 1, &zh->sortKeys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
- records_inserted++;
+ zh->records_inserted++;
}
else
{
/* record already exists */
struct recKeys delkeys;
}
else
{
/* record already exists */
struct recKeys delkeys;
- rec = rec_get (zh->service->records, *sysno);
+ rec = rec_get (zh->reg->records, *sysno);
assert (rec);
assert (rec);
- recordAttr = rec_init_attr (zh->service->zei, rec);
+ recordAttr = rec_init_attr (zh->reg->zei, rec);
if (recordAttr->runNumber ==
if (recordAttr->runNumber ==
- zebraExplain_runNumberIncrement (zh->service->zei, 0))
+ zebraExplain_runNumberIncrement (zh->reg->zei, 0))
{
logf (LOG_LOG, "skipped %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
{
logf (LOG_LOG, "skipped %s %s " PRINTF_OFF_T, rGroup->recordType,
fname, recordOffset);
- extract_flushSortKeys (zh, *sysno, -1, &zh->sortKeys);
+ extract_flushSortKeys (zh, *sysno, -1, &zh->reg->sortKeys);
rec_rm (&rec);
rec_rm (&rec);
- logRecord (0);
+ logRecord (zh);
return 1;
}
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
return 1;
}
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
- extract_flushSortKeys (zh, *sysno, 0, &zh->sortKeys);
+ extract_flushSortKeys (zh, *sysno, 0, &zh->reg->sortKeys);
extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
if (deleteFlag)
{
extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
if (deleteFlag)
{
@@
-578,16
+562,16
@@
static int recordExtract (ZebraHandle zh,
}
else
{
}
else
{
- if (records_processed < rGroup->fileVerboseLimit)
+ if (zh->records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
rGroup->recordType, fname, recordOffset);
logf (LOG_LOG, "delete %s %s " PRINTF_OFF_T,
rGroup->recordType, fname, recordOffset);
- records_deleted++;
+ zh->records_deleted++;
if (matchStr)
if (matchStr)
- dict_delete (zh->service->matchDict, matchStr);
- rec_del (zh->service->records, &rec);
+ dict_delete (zh->reg->matchDict, matchStr);
+ rec_del (zh->reg->records, &rec);
}
rec_rm (&rec);
}
rec_rm (&rec);
- logRecord (0);
+ logRecord (zh);
return 1;
}
else
return 1;
}
else
@@
-601,11
+585,11
@@
static int recordExtract (ZebraHandle zh,
}
else
{
}
else
{
- if (records_processed < rGroup->fileVerboseLimit)
+ if (zh->records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
rGroup->recordType, fname, recordOffset);
logf (LOG_LOG, "update %s %s " PRINTF_OFF_T,
rGroup->recordType, fname, recordOffset);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->keys);
- records_updated++;
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ zh->records_updated++;
}
}
}
}
}
}
@@
-621,13
+605,13
@@
static int recordExtract (ZebraHandle zh,
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
- if (zh->keys.buf_used > 0 && rGroup->flagStoreKeys == 1)
+ if (zh->reg->keys.buf_used > 0 && rGroup->flagStoreKeys == 1)
{
#if 1
{
#if 1
- rec->size[recInfo_delKeys] = zh->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->keys.buf;
- zh->keys.buf = NULL;
- zh->keys.buf_max = 0;
+ rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
+ rec->info[recInfo_delKeys] = zh->reg->keys.buf;
+ zh->reg->keys.buf = NULL;
+ zh->reg->keys.buf_max = 0;
#else
rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used);
rec->size[recInfo_delKeys] = reckeys.buf_used;
#else
rec->info[recInfo_delKeys] = xmalloc (reckeys.buf_used);
rec->size[recInfo_delKeys] = reckeys.buf_used;
@@
-642,16
+626,16
@@
static int recordExtract (ZebraHandle zh,
}
/* save file size of original record */
}
/* save file size of original record */
- zebraExplain_recordBytesIncrement (zh->service->zei,
+ zebraExplain_recordBytesIncrement (zh->reg->zei,
- recordAttr->recordSize);
recordAttr->recordSize = fi->file_moffset - recordOffset;
if (!recordAttr->recordSize)
recordAttr->recordSize = fi->file_max - recordOffset;
- recordAttr->recordSize);
recordAttr->recordSize = fi->file_moffset - recordOffset;
if (!recordAttr->recordSize)
recordAttr->recordSize = fi->file_max - recordOffset;
- zebraExplain_recordBytesIncrement (zh->service->zei,
+ zebraExplain_recordBytesIncrement (zh->reg->zei,
recordAttr->recordSize);
/* set run-number for this record */
recordAttr->recordSize);
/* set run-number for this record */
- recordAttr->runNumber = zebraExplain_runNumberIncrement (zh->service->zei,
+ recordAttr->runNumber = zebraExplain_runNumberIncrement (zh->reg->zei,
0);
/* update store data */
0);
/* update store data */
@@
-689,8
+673,8
@@
static int recordExtract (ZebraHandle zh,
recordAttr->recordOffset = recordOffset;
/* commit this record */
recordAttr->recordOffset = recordOffset;
/* commit this record */
- rec_put (zh->service->records, &rec);
- logRecord (0);
+ rec_put (zh->reg->records, &rec);
+ logRecord (zh);
return 1;
}
return 1;
}
@@
-731,22
+715,22
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
if (!rGroup->recordType)
{
sprintf (ext_res, "%srecordType.%s", gprefix, ext);
if (!rGroup->recordType)
{
sprintf (ext_res, "%srecordType.%s", gprefix, ext);
- if (!(rGroup->recordType = res_get (zh->service->res, ext_res)))
+ if (!(rGroup->recordType = res_get (zh->res, ext_res)))
{
sprintf (ext_res, "%srecordType", gprefix);
{
sprintf (ext_res, "%srecordType", gprefix);
- rGroup->recordType = res_get (zh->service->res, ext_res);
+ rGroup->recordType = res_get (zh->res, ext_res);
}
}
if (!rGroup->recordType)
{
}
}
if (!rGroup->recordType)
{
- if (records_processed < rGroup->fileVerboseLimit)
+ if (zh->records_processed < rGroup->fileVerboseLimit)
logf (LOG_LOG, "? %s", fname);
return 0;
}
if (!*rGroup->recordType)
return 0;
if (!(recType =
logf (LOG_LOG, "? %s", fname);
return 0;
}
if (!*rGroup->recordType)
return 0;
if (!(recType =
- recType_byName (zh->service->recTypes, rGroup->recordType, subType,
+ recType_byName (zh->reg->recTypes, rGroup->recordType, subType,
&clientData)))
{
logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
&clientData)))
{
logf (LOG_WARN, "No such record type: %s", rGroup->recordType);
@@
-757,17
+741,17
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
if (!rGroup->recordId)
{
sprintf (ext_res, "%srecordId.%s", gprefix, ext);
if (!rGroup->recordId)
{
sprintf (ext_res, "%srecordId.%s", gprefix, ext);
- rGroup->recordId = res_get (zh->service->res, ext_res);
+ rGroup->recordId = res_get (zh->res, ext_res);
}
/* determine database name */
if (!rGroup->databaseName)
{
sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
}
/* determine database name */
if (!rGroup->databaseName)
{
sprintf (ext_res, "%sdatabase.%s", gprefix, ext);
- if (!(rGroup->databaseName = res_get (zh->service->res, ext_res)))
+ if (!(rGroup->databaseName = res_get (zh->res, ext_res)))
{
sprintf (ext_res, "%sdatabase", gprefix);
{
sprintf (ext_res, "%sdatabase", gprefix);
- rGroup->databaseName = res_get (zh->service->res, ext_res);
+ rGroup->databaseName = res_get (zh->res, ext_res);
}
}
if (!rGroup->databaseName)
}
}
if (!rGroup->databaseName)
@@
-777,12
+761,12
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
sprintf (ext_res, "%sexplainDatabase", gprefix);
rGroup->explainDatabase =
sprintf (ext_res, "%sexplainDatabase", gprefix);
rGroup->explainDatabase =
- atoi (res_get_def (zh->service->res, ext_res, "0"));
+ atoi (res_get_def (zh->res, ext_res, "0"));
/* announce database */
/* announce database */
- if (zebraExplain_curDatabase (zh->service->zei, rGroup->databaseName))
+ if (zebraExplain_curDatabase (zh->reg->zei, rGroup->databaseName))
{
{
- if (zebraExplain_newDatabase (zh->service->zei, rGroup->databaseName,
+ if (zebraExplain_newDatabase (zh->reg->zei, rGroup->databaseName,
rGroup->explainDatabase))
return 0;
}
rGroup->explainDatabase))
return 0;
}
@@
-791,10
+775,10
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
{
const char *sval;
sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
{
const char *sval;
sprintf (ext_res, "%sstoreData.%s", gprefix, ext);
- if (!(sval = res_get (zh->service->res, ext_res)))
+ if (!(sval = res_get (zh->res, ext_res)))
{
sprintf (ext_res, "%sstoreData", gprefix);
{
sprintf (ext_res, "%sstoreData", gprefix);
- sval = res_get (zh->service->res, ext_res);
+ sval = res_get (zh->res, ext_res);
}
if (sval)
rGroup->flagStoreData = atoi (sval);
}
if (sval)
rGroup->flagStoreData = atoi (sval);
@@
-807,14
+791,14
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
const char *sval;
sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
const char *sval;
sprintf (ext_res, "%sstoreKeys.%s", gprefix, ext);
- sval = res_get (zh->service->res, ext_res);
+ sval = res_get (zh->res, ext_res);
if (!sval)
{
sprintf (ext_res, "%sstoreKeys", gprefix);
if (!sval)
{
sprintf (ext_res, "%sstoreKeys", gprefix);
- sval = res_get (zh->service->res, ext_res);
+ sval = res_get (zh->res, ext_res);
}
if (!sval)
}
if (!sval)
- sval = res_get (zh->service->res, "storeKeys");
+ sval = res_get (zh->res, "storeKeys");
if (sval)
rGroup->flagStoreKeys = atoi (sval);
}
if (sval)
rGroup->flagStoreKeys = atoi (sval);
}
@@
-825,9
+809,21
@@
int fileExtract (ZebraHandle zh, SYSNO *sysno, const char *fname,
fd = -1;
else
{
fd = -1;
else
{
- if ((fd = open (fname, O_BINARY|O_RDONLY)) == -1)
+ char full_rep[1024];
+
+ if (zh->path_reg && !yaz_is_abspath (fname))
{
{
- logf (LOG_WARN|LOG_ERRNO, "open %s", fname);
+ strcpy (full_rep, zh->path_reg);
+ strcat (full_rep, "/");
+ strcat (full_rep, fname);
+ }
+ else
+ strcpy (full_rep, fname);
+
+
+ if ((fd = open (full_rep, O_BINARY|O_RDONLY)) == -1)
+ {
+ logf (LOG_WARN|LOG_ERRNO, "open %s", full_rep);
return 0;
}
}
return 0;
}
}
@@
-855,7
+851,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int i, r;
RecordAttr *recordAttr;
struct recExtractCtrl extractCtrl;
int i, r;
- char *matchStr;
+ char *matchStr = 0;
RecType recType;
char subType[1024];
void *clientData;
RecType recType;
char subType[1024];
void *clientData;
@@
-879,36
+875,36
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
extractCtrl.fh = &fc;
/* announce database */
extractCtrl.fh = &fc;
/* announce database */
- if (zebraExplain_curDatabase (zh->service->zei, databaseName))
+ if (zebraExplain_curDatabase (zh->reg->zei, databaseName))
{
{
- if (zebraExplain_newDatabase (zh->service->zei, databaseName, 0))
+ if (zebraExplain_newDatabase (zh->reg->zei, databaseName, 0))
return 0;
}
if (!(recType =
return 0;
}
if (!(recType =
- recType_byName (zh->service->recTypes, recordType, subType,
+ recType_byName (zh->reg->recTypes, recordType, subType,
&clientData)))
{
logf (LOG_WARN, "No such record type: %s", recordType);
return 0;
}
&clientData)))
{
logf (LOG_WARN, "No such record type: %s", recordType);
return 0;
}
- zh->keys.buf_used = 0;
- zh->keys.prevAttrUse = -1;
- zh->keys.prevAttrSet = -1;
- zh->keys.prevSeqNo = 0;
- zh->sortKeys = 0;
+ zh->reg->keys.buf_used = 0;
+ zh->reg->keys.prevAttrUse = -1;
+ zh->reg->keys.prevAttrSet = -1;
+ zh->reg->keys.prevSeqNo = 0;
+ zh->reg->sortKeys = 0;
extractCtrl.subType = subType;
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
extractCtrl.subType = subType;
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
- extractCtrl.dh = zh->service->dh;
+ extractCtrl.dh = zh->reg->dh;
extractCtrl.handle = zh;
extractCtrl.handle = zh;
- extractCtrl.zebra_maps = zh->service->zebra_maps;
+ extractCtrl.zebra_maps = zh->reg->zebra_maps;
extractCtrl.flagShowRecords = 0;
for (i = 0; i<256; i++)
{
extractCtrl.flagShowRecords = 0;
for (i = 0; i<256; i++)
{
- if (zebra_maps_is_positioned(zh->service->zebra_maps, i))
+ if (zebra_maps_is_positioned(zh->reg->zebra_maps, i))
extractCtrl.seqno[i] = 1;
else
extractCtrl.seqno[i] = 0;
extractCtrl.seqno[i] = 1;
else
extractCtrl.seqno[i] = 0;
@@
-925,7
+921,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
yaz_log (LOG_WARN, "extract error");
#else
if (rGroup->flagRw &&
yaz_log (LOG_WARN, "extract error");
#else
if (rGroup->flagRw &&
- records_processed < rGroup->fileVerboseLimit)
+ zh->records_processed < rGroup->fileVerboseLimit)
{
logf (LOG_WARN, "fail %s %s %ld", rGroup->recordType,
fname, (long) recordOffset);
{
logf (LOG_WARN, "fail %s %s %ld", rGroup->recordType,
fname, (long) recordOffset);
@@
-933,7
+929,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
#endif
return 0;
}
#endif
return 0;
}
- if (zh->keys.buf_used == 0)
+ if (zh->reg->keys.buf_used == 0)
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
{
/* the extraction process returned no information - the record
is probably empty - unless flagShowRecords is in use */
@@
-957,32
+953,32
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
}
logf (LOG_LOG, "add %s %s %ld", recordType, fname,
(long) recordOffset);
}
logf (LOG_LOG, "add %s %s %ld", recordType, fname,
(long) recordOffset);
- rec = rec_new (zh->service->records);
+ rec = rec_new (zh->reg->records);
*sysno = rec->sysno;
*sysno = rec->sysno;
- recordAttr = rec_init_attr (zh->service->zei, rec);
+ recordAttr = rec_init_attr (zh->reg->zei, rec);
if (matchStr)
{
if (matchStr)
{
- dict_insert (zh->service->matchDict, matchStr,
+ dict_insert (zh->reg->matchDict, matchStr,
sizeof(*sysno), sysno);
}
sizeof(*sysno), sysno);
}
- extract_flushRecordKeys (zh, *sysno, 1, &zh->keys);
- extract_flushSortKeys (zh, *sysno, 1, &zh->sortKeys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
+ extract_flushSortKeys (zh, *sysno, 1, &zh->reg->sortKeys);
}
else
{
/* record already exists */
struct recKeys delkeys;
}
else
{
/* record already exists */
struct recKeys delkeys;
- rec = rec_get (zh->service->records, *sysno);
+ rec = rec_get (zh->reg->records, *sysno);
assert (rec);
assert (rec);
- recordAttr = rec_init_attr (zh->service->zei, rec);
+ recordAttr = rec_init_attr (zh->reg->zei, rec);
if (recordAttr->runNumber ==
if (recordAttr->runNumber ==
- zebraExplain_runNumberIncrement (zh->service->zei, 0))
+ zebraExplain_runNumberIncrement (zh->reg->zei, 0))
{
logf (LOG_LOG, "skipped %s %s %ld", recordType,
fname, (long) recordOffset);
{
logf (LOG_LOG, "skipped %s %s %ld", recordType,
fname, (long) recordOffset);
@@
-991,7
+987,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
}
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
}
delkeys.buf_used = rec->size[recInfo_delKeys];
delkeys.buf = rec->info[recInfo_delKeys];
- extract_flushSortKeys (zh, *sysno, 0, &zh->sortKeys);
+ extract_flushSortKeys (zh, *sysno, 0, &zh->reg->sortKeys);
extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
if (delete_flag)
{
extract_flushRecordKeys (zh, *sysno, 0, &delkeys);
if (delete_flag)
{
@@
-1010,7
+1006,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
if (matchStr)
dict_delete (matchDict, matchStr);
#endif
if (matchStr)
dict_delete (matchDict, matchStr);
#endif
- rec_del (zh->service->records, &rec);
+ rec_del (zh->reg->records, &rec);
}
rec_rm (&rec);
return 1;
}
rec_rm (&rec);
return 1;
@@
-1028,7
+1024,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
{
logf (LOG_LOG, "update %s %s %ld", recordType,
fname, (long) recordOffset);
{
logf (LOG_LOG, "update %s %s %ld", recordType,
fname, (long) recordOffset);
- extract_flushRecordKeys (zh, *sysno, 1, &zh->keys);
+ extract_flushRecordKeys (zh, *sysno, 1, &zh->reg->keys);
}
}
}
}
}
}
@@
-1044,12
+1040,12
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
/* update delete keys */
xfree (rec->info[recInfo_delKeys]);
- if (zh->keys.buf_used > 0 && store_keys == 1)
+ if (zh->reg->keys.buf_used > 0 && store_keys == 1)
{
{
- rec->size[recInfo_delKeys] = zh->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->keys.buf;
- zh->keys.buf = NULL;
- zh->keys.buf_max = 0;
+ rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
+ rec->info[recInfo_delKeys] = zh->reg->keys.buf;
+ zh->reg->keys.buf = NULL;
+ zh->reg->keys.buf_max = 0;
}
else
{
}
else
{
@@
-1058,7
+1054,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
}
/* save file size of original record */
}
/* save file size of original record */
- zebraExplain_recordBytesIncrement (zh->service->zei,
+ zebraExplain_recordBytesIncrement (zh->reg->zei,
- recordAttr->recordSize);
#if 0
recordAttr->recordSize = fi->file_moffset - recordOffset;
- recordAttr->recordSize);
#if 0
recordAttr->recordSize = fi->file_moffset - recordOffset;
@@
-1067,12
+1063,12
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
#else
recordAttr->recordSize = buf_size;
#endif
#else
recordAttr->recordSize = buf_size;
#endif
- zebraExplain_recordBytesIncrement (zh->service->zei,
+ zebraExplain_recordBytesIncrement (zh->reg->zei,
recordAttr->recordSize);
/* set run-number for this record */
recordAttr->runNumber =
recordAttr->recordSize);
/* set run-number for this record */
recordAttr->runNumber =
- zebraExplain_runNumberIncrement (zh->service->zei, 0);
+ zebraExplain_runNumberIncrement (zh->reg->zei, 0);
/* update store data */
xfree (rec->info[recInfo_storeData]);
/* update store data */
xfree (rec->info[recInfo_storeData]);
@@
-1113,7
+1109,7
@@
int extract_rec_in_mem (ZebraHandle zh, const char *recordType,
recordAttr->recordOffset = recordOffset;
/* commit this record */
recordAttr->recordOffset = recordOffset;
/* commit this record */
- rec_put (zh->service->records, &rec);
+ rec_put (zh->reg->records, &rec);
return 0;
}
return 0;
}
@@
-1124,35
+1120,33
@@
int explain_extract (void *handle, Record rec, data1_node *n)
struct recExtractCtrl extractCtrl;
int i;
struct recExtractCtrl extractCtrl;
int i;
- if (zebraExplain_curDatabase (zh->service->zei,
+ if (zebraExplain_curDatabase (zh->reg->zei,
rec->info[recInfo_databaseName]))
{
abort();
rec->info[recInfo_databaseName]))
{
abort();
- if (zebraExplain_newDatabase (zh->service->zei,
+ if (zebraExplain_newDatabase (zh->reg->zei,
rec->info[recInfo_databaseName], 0))
abort ();
}
rec->info[recInfo_databaseName], 0))
abort ();
}
- zh->keys.buf_used = 0;
- zh->keys.prevAttrUse = -1;
- zh->keys.prevAttrSet = -1;
- zh->keys.prevSeqNo = 0;
- zh->sortKeys = 0;
+ zh->reg->keys.buf_used = 0;
+ zh->reg->keys.prevAttrUse = -1;
+ zh->reg->keys.prevAttrSet = -1;
+ zh->reg->keys.prevSeqNo = 0;
+ zh->reg->sortKeys = 0;
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
extractCtrl.init = extract_init;
extractCtrl.tokenAdd = extract_token_add;
extractCtrl.schemaAdd = extract_schema_add;
- extractCtrl.dh = zh->service->dh;
+ extractCtrl.dh = zh->reg->dh;
for (i = 0; i<256; i++)
extractCtrl.seqno[i] = 0;
for (i = 0; i<256; i++)
extractCtrl.seqno[i] = 0;
- extractCtrl.zebra_maps = zh->service->zebra_maps;
+ extractCtrl.zebra_maps = zh->reg->zebra_maps;
extractCtrl.flagShowRecords = 0;
extractCtrl.handle = handle;
grs_extract_tree(&extractCtrl, n);
extractCtrl.flagShowRecords = 0;
extractCtrl.handle = handle;
grs_extract_tree(&extractCtrl, n);
- logf (LOG_LOG, "flush explain record, sysno=%d", rec->sysno);
-
if (rec->size[recInfo_delKeys])
{
struct recKeys delkeys;
if (rec->size[recInfo_delKeys])
{
struct recKeys delkeys;
@@
-1163,14
+1157,14
@@
int explain_extract (void *handle, Record rec, data1_node *n)
extract_flushSortKeys (zh, rec->sysno, 0, &sortKeys);
extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
}
extract_flushSortKeys (zh, rec->sysno, 0, &sortKeys);
extract_flushRecordKeys (zh, rec->sysno, 0, &delkeys);
}
- extract_flushRecordKeys (zh, rec->sysno, 1, &zh->keys);
- extract_flushSortKeys (zh, rec->sysno, 1, &zh->sortKeys);
+ extract_flushRecordKeys (zh, rec->sysno, 1, &zh->reg->keys);
+ extract_flushSortKeys (zh, rec->sysno, 1, &zh->reg->sortKeys);
xfree (rec->info[recInfo_delKeys]);
xfree (rec->info[recInfo_delKeys]);
- rec->size[recInfo_delKeys] = zh->keys.buf_used;
- rec->info[recInfo_delKeys] = zh->keys.buf;
- zh->keys.buf = NULL;
- zh->keys.buf_max = 0;
+ rec->size[recInfo_delKeys] = zh->reg->keys.buf_used;
+ rec->info[recInfo_delKeys] = zh->reg->keys.buf;
+ zh->reg->keys.buf = NULL;
+ zh->reg->keys.buf_max = 0;
return 0;
}
return 0;
}
@@
-1185,16
+1179,16
@@
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
int seqno = 0;
int off = 0;
int ch = 0;
int seqno = 0;
int off = 0;
int ch = 0;
- ZebraExplainInfo zei = zh->service->zei;
+ ZebraExplainInfo zei = zh->reg->zei;
- if (!zh->key_buf)
+ if (!zh->reg->key_buf)
{
int mem = 8*1024*1024;
{
int mem = 8*1024*1024;
- zh->key_buf = (char**) xmalloc (mem);
- zh->ptr_top = mem/sizeof(char*);
- zh->ptr_i = 0;
- zh->key_buf_used = 0;
- zh->key_file_no = 0;
+ zh->reg->key_buf = (char**) xmalloc (mem);
+ zh->reg->ptr_top = mem/sizeof(char*);
+ zh->reg->ptr_i = 0;
+ zh->reg->key_buf_used = 0;
+ zh->reg->key_file_no = 0;
}
zebraExplain_recordCountIncrement (zei, cmd ? 1 : -1);
while (off < reckeys->buf_used)
}
zebraExplain_recordCountIncrement (zei, cmd ? 1 : -1);
while (off < reckeys->buf_used)
@@
-1223,11
+1217,12
@@
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
src += sizeof(attrUse);
}
#endif
src += sizeof(attrUse);
}
#endif
- if (zh->key_buf_used + 1024 > (zh->ptr_top-zh->ptr_i)*sizeof(char*))
+ if (zh->reg->key_buf_used + 1024 >
+ (zh->reg->ptr_top -zh->reg->ptr_i)*sizeof(char*))
extract_flushWriteKeys (zh);
extract_flushWriteKeys (zh);
- ++(zh->ptr_i);
- (zh->key_buf)[zh->ptr_top - zh->ptr_i] =
- (char*)zh->key_buf + zh->key_buf_used;
+ ++(zh->reg->ptr_i);
+ (zh->reg->key_buf)[zh->reg->ptr_top - zh->reg->ptr_i] =
+ (char*)zh->reg->key_buf + zh->reg->key_buf_used;
#if SU_SCHEME
#else
ch = zebraExplain_lookupSU (zei, attrSet, attrUse);
#if SU_SCHEME
#else
ch = zebraExplain_lookupSU (zei, attrSet, attrUse);
@@
-1235,14
+1230,15
@@
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
ch = zebraExplain_addSU (zei, attrSet, attrUse);
#endif
assert (ch > 0);
ch = zebraExplain_addSU (zei, attrSet, attrUse);
#endif
assert (ch > 0);
- zh->key_buf_used +=
- key_SU_encode (ch,((char*)zh->key_buf) + zh->key_buf_used);
+ zh->reg->key_buf_used +=
+ key_SU_encode (ch,((char*)zh->reg->key_buf) +
+ zh->reg->key_buf_used);
while (*src)
while (*src)
- ((char*)zh->key_buf) [(zh->key_buf_used)++] = *src++;
+ ((char*)zh->reg->key_buf) [(zh->reg->key_buf_used)++] = *src++;
src++;
src++;
- ((char*)(zh->key_buf))[(zh->key_buf_used)++] = '\0';
- ((char*)(zh->key_buf))[(zh->key_buf_used)++] = cmd;
+ ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = '\0';
+ ((char*)(zh->reg->key_buf))[(zh->reg->key_buf_used)++] = cmd;
if (lead & 60)
seqno += ((lead>>2) & 15)-1;
if (lead & 60)
seqno += ((lead>>2) & 15)-1;
@@
-1253,8
+1249,8
@@
void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno,
}
key.seqno = seqno;
key.sysno = sysno;
}
key.seqno = seqno;
key.sysno = sysno;
- memcpy ((char*)zh->key_buf + zh->key_buf_used, &key, sizeof(key));
- (zh->key_buf_used) += sizeof(key);
+ memcpy ((char*)zh->reg->key_buf + zh->reg->key_buf_used, &key, sizeof(key));
+ (zh->reg->key_buf_used) += sizeof(key);
off = src - reckeys->buf;
}
assert (off == reckeys->buf_used);
off = src - reckeys->buf;
}
assert (off == reckeys->buf_used);
@@
-1266,34
+1262,34
@@
void extract_flushWriteKeys (ZebraHandle zh)
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
char out_fname[200];
char *prevcp, *cp;
struct encode_info encode_info;
- int ptr_i = zh->ptr_i;
+ int ptr_i = zh->reg->ptr_i;
#if SORT_EXTRA
int i;
#endif
#if SORT_EXTRA
int i;
#endif
- if (!zh->key_buf || ptr_i <= 0)
+ if (!zh->reg->key_buf || ptr_i <= 0)
return;
return;
- (zh->key_file_no)++;
- logf (LOG_LOG, "sorting section %d", (zh->key_file_no));
+ (zh->reg->key_file_no)++;
+ logf (LOG_LOG, "sorting section %d", (zh->reg->key_file_no));
#if !SORT_EXTRA
#if !SORT_EXTRA
- qsort (zh->key_buf + zh->ptr_top - ptr_i, ptr_i, sizeof(char*),
+ qsort (zh->reg->key_buf + zh->reg->ptr_top - ptr_i, ptr_i, sizeof(char*),
key_qsort_compare);
key_qsort_compare);
- extract_get_fname_tmp (zh, out_fname, zh->key_file_no);
+ extract_get_fname_tmp (zh, out_fname, zh->reg->key_file_no);
if (!(outf = fopen (out_fname, "wb")))
{
logf (LOG_FATAL|LOG_ERRNO, "fopen %s", out_fname);
exit (1);
}
if (!(outf = fopen (out_fname, "wb")))
{
logf (LOG_FATAL|LOG_ERRNO, "fopen %s", out_fname);
exit (1);
}
- logf (LOG_LOG, "writing section %d", zh->key_file_no);
- prevcp = cp = (zh->key_buf)[zh->ptr_top - ptr_i];
+ logf (LOG_LOG, "writing section %d", zh->reg->key_file_no);
+ prevcp = cp = (zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
encode_key_init (&encode_info);
encode_key_write (cp, &encode_info, outf);
while (--ptr_i > 0)
{
encode_key_init (&encode_info);
encode_key_write (cp, &encode_info, outf);
while (--ptr_i > 0)
{
- cp = (zh->key_buf)[zh->ptr_top - ptr_i];
+ cp = (zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
if (strcmp (cp, prevcp))
{
encode_key_init (&encode_info);
if (strcmp (cp, prevcp))
{
encode_key_init (&encode_info);
@@
-1344,9
+1340,9
@@
void extract_flushWriteKeys (ZebraHandle zh)
logf (LOG_FATAL|LOG_ERRNO, "fclose %s", out_fname);
exit (1);
}
logf (LOG_FATAL|LOG_ERRNO, "fclose %s", out_fname);
exit (1);
}
- logf (LOG_LOG, "finished section %d", zh->key_file_no);
- zh->ptr_i = 0;
- zh->key_buf_used = 0;
+ logf (LOG_LOG, "finished section %d", zh->reg->key_file_no);
+ zh->reg->ptr_i = 0;
+ zh->reg->key_buf_used = 0;
}
void extract_add_index_string (RecWord *p, const char *string,
}
void extract_add_index_string (RecWord *p, const char *string,
@@
-1357,11
+1353,11
@@
void extract_add_index_string (RecWord *p, const char *string,
unsigned short attrUse;
int lead = 0;
int diff = 0;
unsigned short attrUse;
int lead = 0;
int diff = 0;
- int *pseqno = &p->seqnos[p->reg_type];
+ int *pseqno = &p->seqno;
ZebraHandle zh = p->extractCtrl->handle;
ZebraHandle zh = p->extractCtrl->handle;
- ZebraExplainInfo zei = zh->service->zei;
- struct recKeys *keys = &zh->keys;
-
+ ZebraExplainInfo zei = zh->reg->zei;
+ struct recKeys *keys = &zh->reg->keys;
+
if (keys->buf_used+1024 > keys->buf_max)
{
char *b;
if (keys->buf_used+1024 > keys->buf_max)
{
char *b;
@@
-1402,7
+1398,7
@@
void extract_add_index_string (RecWord *p, const char *string,
if (ch < 0)
{
ch = zebraExplain_addSU (zei, attrSet, attrUse);
if (ch < 0)
{
ch = zebraExplain_addSU (zei, attrSet, attrUse);
- yaz_log (LOG_LOG, "addSU set=%d use=%d SU=%d",
+ yaz_log (LOG_DEBUG, "addSU set=%d use=%d SU=%d",
attrSet, attrUse, ch);
}
assert (ch > 0);
attrSet, attrUse, ch);
}
assert (ch > 0);
@@
-1432,8
+1428,6
@@
void extract_add_index_string (RecWord *p, const char *string,
dst += sizeof(*pseqno);
}
keys->buf_used = dst - keys->buf;
dst += sizeof(*pseqno);
}
keys->buf_used = dst - keys->buf;
- if (*pseqno)
- (*pseqno)++;
}
static void extract_add_sort_string (RecWord *p, const char *string,
}
static void extract_add_sort_string (RecWord *p, const char *string,
@@
-1442,13
+1436,13
@@
static void extract_add_sort_string (RecWord *p, const char *string,
struct sortKey *sk;
ZebraHandle zh = p->extractCtrl->handle;
struct sortKey *sk;
ZebraHandle zh = p->extractCtrl->handle;
- for (sk = zh->sortKeys; sk; sk = sk->next)
+ for (sk = zh->reg->sortKeys; sk; sk = sk->next)
if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
return;
sk = (struct sortKey *) xmalloc (sizeof(*sk));
if (sk->attrSet == p->attrSet && sk->attrUse == p->attrUse)
return;
sk = (struct sortKey *) xmalloc (sizeof(*sk));
- sk->next = zh->sortKeys;
- zh->sortKeys = sk;
+ sk->next = zh->reg->sortKeys;
+ zh->reg->sortKeys = sk;
sk->string = (char *) xmalloc (length);
sk->length = length;
sk->string = (char *) xmalloc (length);
sk->length = length;
@@
-1508,8
+1502,8
@@
static void extract_add_incomplete_field (RecWord *p)
if (!i)
return;
extract_add_string (p, buf, i);
if (!i)
return;
extract_add_string (p, buf, i);
+ p->seqno++;
}
}
- (p->seqnos[p->reg_type])++; /* to separate this from next one */
}
static void extract_add_complete_field (RecWord *p)
}
static void extract_add_complete_field (RecWord *p)
@@
-1576,14
+1570,14
@@
void extract_token_add (RecWord *p)
void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
{
ZebraHandle zh = (ZebraHandle) (p->handle);
void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid)
{
ZebraHandle zh = (ZebraHandle) (p->handle);
- zebraExplain_addSchema (zh->service->zei, oid);
+ zebraExplain_addSchema (zh->reg->zei, oid);
}
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct sortKey **skp)
{
struct sortKey *sk = *skp;
}
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
int cmd, struct sortKey **skp)
{
struct sortKey *sk = *skp;
- SortIdx sortIdx = zh->service->sortIdx;
+ SortIdx sortIdx = zh->reg->sortIdx;
sortIdx_sysno (sortIdx, sysno);
while (sk)
sortIdx_sysno (sortIdx, sysno);
while (sk)
@@
-1595,7
+1589,6
@@
void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno,
xfree (sk);
sk = sk_next;
}
xfree (sk);
sk = sk_next;
}
- yaz_log (LOG_LOG, "extract_flushSortKeys");
*skp = 0;
}
*skp = 0;
}