-/* $Id: zinfo.c,v 1.69 2006-09-15 10:45:13 adam Exp $
+/* $Id: zinfo.c,v 1.74 2006-11-27 10:09:48 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
typedef struct zebAccessObjectB *zebAccessObject;
struct zebAccessObjectB {
void *handle;
- SYSNO sysno;
+ zint sysno;
Odr_oid *oid;
zebAccessObject next;
};
typedef struct {
struct zebSUInfoB *SUInfo;
- SYSNO sysno;
+ zint sysno;
int dirty;
int readFlag;
data1_node *data1_tree;
data1_node *data1_database;
zint recordCount; /* records in db */
zint recordBytes; /* size of records */
- SYSNO sysno; /* sysno of database info */
+ zint sysno; /* sysno of database info */
int readFlag; /* 1: read is needed when referenced; 0 if not */
int dirty; /* 1: database is dirty: write is needed */
struct zebDatabaseInfoB *next;
struct zebraCategoryListInfo {
int dirty;
- SYSNO sysno;
+ zint sysno;
data1_node *data1_categoryList;
};
int key_flush);
-static Record createRecord(Records records, SYSNO *sysno)
+static Record createRecord(Records records, zint *sysno)
{
Record rec;
if (*sysno)
if (!c)
{
data1_pr_tree (zei->dh, n, stdout);
- exit (0);
- assert (c);
+ zebra_exit("zebraExplain_updateAccessInfo");
}
if ((p = accessInfo->attributeSetIds))
zebraExplain_initCommonInfo (zei, node_adinfo);
+ data1_mk_tag_data_text(zei->dh, node_adinfo, "name", database, zei->nmem);
+
return 0;
}
int i;
Record drec;
data1_node *node_ci, *node_categoryList;
- SYSNO sysno = 0;
+ zint sysno = 0;
static char *category[] = {
"CategoryList",
"TargetInfo",
zad->dirty = 0;
#if ZINFO_DEBUG
yaz_log(YLOG_LOG, "zebraExplain_writeAttributeDetails");
+ data1_pr_tree(zei->dh, zad->data1_tree, stderr);
#endif
drec = createRecord (zei->records, &zad->sysno);
"/attributeDetails");
zebraExplain_updateCommonInfo (zei, node_adinfo);
- data1_mk_tag_data_text (zei->dh, node_adinfo, "name",
- databaseName, zei->nmem);
-
/* extract *searchable* keys from it. We do this here, because
record count, etc. is affected */
if (key_flush)
assert (zei->curDatabaseInfo);
for (zsui = &zei->curDatabaseInfo->attributeDetails->SUInfo;
*zsui; zsui = &(*zsui)->next)
- if ((*zsui)->info.index_type == index_type
- && (*zsui)->info.cat == cat
- && (*zsui)->info.which == ZEB_SU_STR
- && !yaz_matchstr((*zsui)->info.u.str, str))
+ if ( (index_type == -1 || (*zsui)->info.index_type == index_type)
+ && (*zsui)->info.cat == cat
+ && (*zsui)->info.which == ZEB_SU_STR
+ && !yaz_matchstr((*zsui)->info.u.str, str))
{
struct zebSUInfoB *zsui_this = *zsui;
if (rec->info[recInfo_attr])
return (RecordAttr *) rec->info[recInfo_attr];
recordAttr = (RecordAttr *) xmalloc (sizeof(*recordAttr));
+
+ memset(recordAttr, '\0', sizeof(*recordAttr));
rec->info[recInfo_attr] = (char *) recordAttr;
rec->size[recInfo_attr] = sizeof(*recordAttr);