-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Id: zinfo.c,v 1.32 2002-07-11 13:15:57 heikki Exp $
- */
+/* $Id: zinfo.c,v 1.52 2005-12-08 11:10:03 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
-#include <stdlib.h>
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+#include <sys/types.h>
#include <assert.h>
+#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <zebraver.h>
+#include <idzebra/version.h>
#include "zinfo.h"
#define ZINFO_DEBUG 0
struct zebSUInfo {
- int set;
- int use;
+ int index_type;
+#define ZEB_SU_SET_USE 1
+#define ZEB_SU_STR 2
+ int which;
+ union {
+ char *str;
+ struct {
+ int set;
+ int use;
+ } su;
+ } u;
int ordinal;
};
typedef struct zebAccessObjectB *zebAccessObject;
struct zebAccessObjectB {
void *handle;
- int sysno;
+ SYSNO sysno;
Odr_oid *oid;
zebAccessObject next;
};
typedef struct {
struct zebSUInfoB *SUInfo;
- int sysno;
+ SYSNO sysno;
int dirty;
int readFlag;
data1_node *data1_tree;
zebAttributeDetails attributeDetails;
char *databaseName;
data1_node *data1_database;
- int recordCount; /* records in db */
- int recordBytes; /* size of records */
- int sysno; /* sysno of database info */
+ zint recordCount; /* records in db */
+ zint recordBytes; /* size of records */
+ SYSNO 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;
- int sysno;
+ SYSNO sysno;
data1_node *data1_categoryList;
};
struct zebraExplainInfo {
- int ordinalSU;
- int runNumber;
- int dirty;
+ int ordinalSU;
+ zint runNumber;
+ int dirty;
int write_flag;
Records records;
data1_handle dh;
int key_flush);
-static Record createRecord (Records records, int *sysno)
+static Record createRecord (Records records, SYSNO *sysno)
{
Record rec;
if (*sysno)
void zebraExplain_close (ZebraExplainInfo zei)
{
#if ZINFO_DEBUG
- yaz_log (LOG_LOG, "zebraExplain_close");
+ yaz_log (YLOG_LOG, "zebraExplain_close");
#endif
if (!zei)
return;
}
}
+/* Explain structure
+ root record
+ of type targetInfo
+ and has sysno = 1
+
+ databaseList (list of databases)
+*/
+/*
+Example root:
+explain:
+ targetInfo: TargetInfo
+ name: Zebra
+ namedResultSets: 1
+ multipleDbSearch: 1
+ nicknames:
+ name: Zebra
+ commonInfo:
+ dateAdded: 20030630190601
+ dateChanged: 20030630190601
+ languageCode: EN
+ accessinfo:
+ unitSystems:
+ string: ISO
+ attributeSetIds:
+ oid: 1.2.840.10003.3.2
+ oid: 1.2.840.10003.3.5
+ oid: 1.2.840.10003.3.1
+ schemas:
+ oid: 1.2.840.10003.13.1000.81.2
+ oid: 1.2.840.10003.13.2
+ zebraInfo:
+ version: 1.3.12
+ databaseList:
+ database:
+ name: Default
+ id: 50
+ attributeDetailsId: 51
+ database:
+ name: IR-Explain-1
+ id: 52
+ attributeDetailsId: 53
+ ordinalSU: 38
+ runNumber: 1
+nextResultSetPosition = 2
+*/
+
ZebraExplainInfo zebraExplain_open (
Records records, data1_handle dh,
Res res,
NMEM nmem = nmem_create ();
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_open wr=%d", writeFlag);
+ yaz_log (YLOG_LOG, "zebraExplain_open wr=%d", writeFlag);
#endif
zei = (ZebraExplainInfo) nmem_malloc (nmem, sizeof(*zei));
+ zei->databaseInfo = 0;
zei->write_flag = writeFlag;
zei->updateHandle = updateHandle;
zei->updateFunc = updateFunc;
0, 0, 0, 0, 0, 0);
}
zdip = &zei->databaseInfo;
- trec = rec_get (records, 1); /* get "root" record */
+ trec = rec_get_root(records); /* get "root" record */
zei->ordinalSU = 1;
zei->runNumber = 0;
if (!zei->data1_target)
#endif
{
- logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ yaz_log (YLOG_FATAL, "Explain schema missing. Check profilePath");
nmem_destroy (zei->nmem);
return 0;
}
memcpy ((*zdip)->databaseName, node_name->u.data.data,
node_name->u.data.len);
(*zdip)->databaseName[node_name->u.data.len] = '\0';
- (*zdip)->sysno = atoi_n (node_id->u.data.data,
- node_id->u.data.len);
+ (*zdip)->sysno = atoi_zn (node_id->u.data.data,
+ node_id->u.data.len);
(*zdip)->attributeDetails = (zebAttributeDetails)
nmem_malloc (zei->nmem, sizeof(*(*zdip)->attributeDetails));
- (*zdip)->attributeDetails->sysno = atoi_n (node_aid->u.data.data,
- node_aid->u.data.len);
+ (*zdip)->attributeDetails->sysno = atoi_zn (node_aid->u.data.data,
+ node_aid->u.data.len);
(*zdip)->attributeDetails->readFlag = 1;
(*zdip)->attributeDetails->dirty = 0;
(*zdip)->attributeDetails->SUInfo = NULL;
"runNumber");
np = np->child;
assert (np && np->which == DATA1N_data);
- zei->runNumber = atoi_n (np->u.data.data, np->u.data.len);
- yaz_log (LOG_LOG, "READ runnumber = %d", zei->runNumber);
+ zei->runNumber = atoi_zn (np->u.data.data, np->u.data.len);
+ yaz_log (YLOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber);
*zdip = NULL;
}
rec_rm (&trec);
"</></>\n" );
if (!zei->data1_target)
{
- logf (LOG_FATAL, "Explain schema missing. Check profilePath");
+ yaz_log (YLOG_FATAL, "Explain schema missing. Check profilePath");
nmem_destroy (zei->nmem);
return 0;
}
{
data1_node *node_set = NULL;
data1_node *node_use = NULL;
+ data1_node *node_str = NULL;
data1_node *node_ordinal = NULL;
+ data1_node *node_type = NULL;
data1_node *np2;
char oid_str[128];
int oid_str_len;
node_set = np2->child;
else if (!strcmp (np2->u.tag.tag, "use"))
node_use = np2->child;
+ else if (!strcmp (np2->u.tag.tag, "str"))
+ node_str = np2->child;
else if (!strcmp (np2->u.tag.tag, "ordinal"))
node_ordinal = np2->child;
+ else if (!strcmp (np2->u.tag.tag, "type"))
+ node_type = np2->child;
}
- assert (node_set && node_use && node_ordinal);
-
- oid_str_len = node_set->u.data.len;
- if (oid_str_len >= (int) sizeof(oid_str))
- oid_str_len = sizeof(oid_str)-1;
- memcpy (oid_str, node_set->u.data.data, oid_str_len);
- oid_str[oid_str_len] = '\0';
+ assert (node_ordinal);
*zsuip = (struct zebSUInfoB *)
nmem_malloc (zei->nmem, sizeof(**zsuip));
- (*zsuip)->info.set = oid_getvalbyname (oid_str);
- (*zsuip)->info.use = atoi_n (node_use->u.data.data,
- node_use->u.data.len);
+ if (node_type && node_type->u.data.len > 0)
+ (*zsuip)->info.index_type = node_type->u.data.data[0];
+ else
+ {
+ yaz_log(YLOG_WARN, "Missing attribute 'type' in attribute info");
+ (*zsuip)->info.index_type = 'w';
+ }
+
+ if (node_set && node_use)
+ {
+ (*zsuip)->info.which = ZEB_SU_SET_USE;
+
+ oid_str_len = node_set->u.data.len;
+ if (oid_str_len >= (int) sizeof(oid_str))
+ oid_str_len = sizeof(oid_str)-1;
+ memcpy (oid_str, node_set->u.data.data, oid_str_len);
+ oid_str[oid_str_len] = '\0';
+
+ (*zsuip)->info.u.su.set = oid_getvalbyname (oid_str);
+
+ (*zsuip)->info.u.su.use = atoi_n (node_use->u.data.data,
+ node_use->u.data.len);
+ yaz_log (YLOG_DEBUG, "set=%d use=%d ordinal=%d",
+ (*zsuip)->info.u.su.set, (*zsuip)->info.u.su.use,
+ (*zsuip)->info.ordinal);
+ }
+ else if (node_str)
+ {
+ (*zsuip)->info.which = ZEB_SU_STR;
+
+ (*zsuip)->info.u.str = nmem_strdupn(zei->nmem,
+ node_str->u.data.data,
+ node_str->u.data.len);
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Missing set/use/str in attribute info");
+ continue;
+ }
(*zsuip)->info.ordinal = atoi_n (node_ordinal->u.data.data,
node_ordinal->u.data.len);
- logf (LOG_DEBUG, "set=%d use=%d ordinal=%d",
- (*zsuip)->info.set, (*zsuip)->info.use, (*zsuip)->info.ordinal);
zsuip = &(*zsuip)->next;
}
*zsuip = NULL;
&& (np = data1_search_tag (zei->dh, node_zebra->child,
"recordBytes"))
&& np->child && np->child->which == DATA1N_data)
- zdi->recordBytes = atoi_n (np->child->u.data.data,
- np->child->u.data.len);
+ zdi->recordBytes = atoi_zn (np->child->u.data.data,
+ np->child->u.data.len);
if ((np = data1_search_tag (zei->dh, node_dbinfo->child,
"recordCount")) &&
(np = data1_search_tag (zei->dh, np->child,
"recordCountActual")) &&
np->child->which == DATA1N_data)
{
- zdi->recordCount = atoi_n (np->child->u.data.data,
- np->child->u.data.len);
+ zdi->recordCount = atoi_zn (np->child->u.data.data,
+ np->child->u.data.len);
}
zdi->readFlag = 0;
rec_rm (&rec);
}
+int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle)
+{
+ struct zebDatabaseInfoB **zdip = &zei->databaseInfo;
+
+ while (*zdip)
+ {
+ if (*zdip == zei->curDatabaseInfo)
+ {
+ struct zebDatabaseInfoB *zdi = *zdip;
+ Record rec;
+
+ zei->dirty = 1;
+ zei->updateHandle = update_handle;
+
+ if (zdi->attributeDetails)
+ {
+ /* remove attribute details keys and delete it */
+ zebAttributeDetails zad = zdi->attributeDetails;
+
+ rec = rec_get(zei->records, zad->sysno);
+ (*zei->updateFunc)(zei->updateHandle, rec, 0);
+ rec_rm(&rec);
+ }
+ /* remove database record keys and delete it */
+ rec = rec_get (zei->records, zdi->sysno);
+ (*zei->updateFunc)(zei->updateHandle, rec, 0);
+ rec_rm(&rec);
+
+ /* remove from list */
+ *zdip = zdi->next;
+
+ /* current database is IR-Explain-1 */
+ return 0;
+ }
+ zdip = &(*zdip)->next;
+ }
+ return -1;
+}
+
int zebraExplain_curDatabase (ZebraExplainInfo zei, const char *database)
{
struct zebDatabaseInfoB *zdi;
assert (zei);
if (zei->curDatabaseInfo &&
- !strcmp (zei->curDatabaseInfo->databaseName, database))
+ !STRCASECMP (zei->curDatabaseInfo->databaseName, database))
return 0;
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
- if (!strcmp (zdi->databaseName, database_n))
+ if (!STRCASECMP (zdi->databaseName, database_n))
break;
}
if (!zdi)
return -1;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_curDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_curDatabase: %s", database);
#endif
if (zdi->readFlag)
{
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_readDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_readDatabase: %s", database);
#endif
zebraExplain_readDatabase (zei, zdi);
}
if (zdi->attributeDetails->readFlag)
{
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_readAttributeDetails: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_readAttributeDetails: %s", database);
#endif
zebraExplain_readAttributeDetails (zei, zdi->attributeDetails);
}
database_n = database;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_newDatabase: %s", database);
+ yaz_log (YLOG_LOG, "zebraExplain_newDatabase: %s", database);
#endif
assert (zei);
for (zdi = zei->databaseInfo; zdi; zdi=zdi->next)
{
- if (!strcmp (zdi->databaseName, database_n))
+ if (!STRCASECMP (zdi->databaseName, database_n))
break;
}
if (zdi)
writeAttributeValueDetails (zei, zad, node_atvs, c->child);
for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
{
- data1_node *node_attvalue, *node_value;
- if (set_ordinal != zsui->info.set)
- continue;
- node_attvalue = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
- 0 /* attr */, node_atvs);
- node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
- 0 /* attr */, node_attvalue);
- data1_mk_tag_data_int (zei->dh, node_value, "numeric",
- zsui->info.use, zei->nmem);
+ if (zsui->info.which == ZEB_SU_SET_USE &&
+ set_ordinal == zsui->info.u.su.set)
+ {
+ data1_node *node_attvalue, *node_value;
+ node_attvalue = data1_mk_tag (zei->dh, zei->nmem, "attributeValue",
+ 0 /* attr */, node_atvs);
+ node_value = data1_mk_tag (zei->dh, zei->nmem, "value",
+ 0 /* attr */, node_attvalue);
+ data1_mk_tag_data_int (zei->dh, node_value, "numeric",
+ zsui->info.u.su.use, zei->nmem);
+ }
}
}
int i;
Record drec;
data1_node *node_ci, *node_categoryList;
- int sysno = 0;
+ SYSNO sysno = 0;
static char *category[] = {
"CategoryList",
"TargetInfo",
node_categoryList = zcl->data1_categoryList;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeCategoryList");
+ yaz_log (YLOG_LOG, "zebraExplain_writeCategoryList");
#endif
drec = createRecord (zei->records, &sysno);
zad->dirty = 0;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeAttributeDetails");
+ yaz_log (YLOG_LOG, "zebraExplain_writeAttributeDetails");
#endif
drec = createRecord (zei->records, &zad->sysno);
int set_ordinal = -1;
for (zsui = zad->SUInfo; zsui; zsui = zsui->next)
{
- if ((set_ordinal < 0 || set_ordinal > zsui->info.set)
- && zsui->info.set > set_min)
- set_ordinal = zsui->info.set;
+ if (zsui->info.which == ZEB_SU_SET_USE &&
+ (set_ordinal < 0 || set_ordinal > zsui->info.u.su.set)
+ && zsui->info.u.su.set > set_min)
+ set_ordinal = zsui->info.u.su.set;
}
if (set_ordinal < 0)
break;
struct oident oident;
int oid[OID_SIZE];
data1_node *node_attr;
+ char index_type_str[2];
+
node_attr = data1_mk_tag (zei->dh, zei->nmem, "attr", 0 /* attr */,
node_list);
-
- oident.proto = PROTO_Z3950;
- oident.oclass = CLASS_ATTSET;
- oident.value = (enum oid_value) zsui->info.set;
- oid_ent_to_oid (&oident, oid);
-
- data1_mk_tag_data_text (zei->dh, node_attr, "set",
- oident.desc, zei->nmem);
- data1_mk_tag_data_int (zei->dh, node_attr, "use",
- zsui->info.use, zei->nmem);
+
+ index_type_str[0] = zsui->info.index_type;
+ index_type_str[1] = '\0';
+ data1_mk_tag_data_text (zei->dh, node_attr, "type",
+ index_type_str, zei->nmem);
+ if (zsui->info.which == ZEB_SU_SET_USE)
+ {
+ oident.proto = PROTO_Z3950;
+ oident.oclass = CLASS_ATTSET;
+ oident.value = (enum oid_value) zsui->info.u.su.set;
+ oid_ent_to_oid (&oident, oid);
+
+ data1_mk_tag_data_text (zei->dh, node_attr, "set",
+ oident.desc, zei->nmem);
+ data1_mk_tag_data_int (zei->dh, node_attr, "use",
+ zsui->info.u.su.use, zei->nmem);
+ }
+ else if (zsui->info.which == ZEB_SU_STR)
+ {
+ data1_mk_tag_data_text (zei->dh, node_attr, "str",
+ zsui->info.u.str, zei->nmem);
+ }
data1_mk_tag_data_int (zei->dh, node_attr, "ordinal",
zsui->info.ordinal, zei->nmem);
}
zdi->dirty = 0;
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeDatabase %s", zdi->databaseName);
+ yaz_log (YLOG_LOG, "zebraExplain_writeDatabase %s", zdi->databaseName);
#endif
drec = createRecord (zei->records, &zdi->sysno);
assert (zdi->data1_database);
/* record count */
node_count = data1_mk_tag_uni (zei->dh, zei->nmem,
"recordCount", node_dbinfo);
- data1_mk_tag_data_int (zei->dh, node_count, "recordCountActual",
- zdi->recordCount, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_count, "recordCountActual",
+ zdi->recordCount, zei->nmem);
/* zebra info (private) */
node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem,
"zebraInfo", node_dbinfo);
- data1_mk_tag_data_int (zei->dh, node_zebra,
+ data1_mk_tag_data_zint (zei->dh, node_zebra,
"recordBytes", zdi->recordBytes, zei->nmem);
/* convert to "SGML" and write it */
#if ZINFO_DEBUG
attset = data1_attset_search_id (zei->dh, entp->value);
#if ZINFO_DEBUG
- logf (LOG_LOG, "zebraExplain_writeAttributeSet %s",
+ yaz_log (YLOG_LOG, "zebraExplain_writeAttributeSet %s",
attset ? attset->name : "<unknown>");
#endif
return;
zei->dirty = 0;
- trec = rec_get (zei->records, 1);
+ trec = rec_get_root(zei->records);
xfree (trec->info[recInfo_storeData]);
node_tgtinfo = data1_search_tag (zei->dh, zei->data1_target,
"database", 0 /* attr */, node_list);
data1_mk_tag_data_text (zei->dh, node_db, "name",
zdi->databaseName, zei->nmem);
- data1_mk_tag_data_int (zei->dh, node_db, "id",
- zdi->sysno, zei->nmem);
- data1_mk_tag_data_int (zei->dh, node_db, "attributeDetailsId",
- zdi->attributeDetails->sysno, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_db, "id",
+ zdi->sysno, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_db, "attributeDetailsId",
+ zdi->attributeDetails->sysno, zei->nmem);
}
data1_mk_tag_data_int (zei->dh, node_zebra, "ordinalSU",
zei->ordinalSU, zei->nmem);
- data1_mk_tag_data_int (zei->dh, node_zebra, "runNumber",
- zei->runNumber, zei->nmem);
+ data1_mk_tag_data_zint (zei->dh, node_zebra, "runNumber",
+ zei->runNumber, zei->nmem);
#if ZINFO_DEBUG
data1_pr_tree (zei->dh, zei->data1_target, stderr);
rec_put (zei->records, &trec);
}
-int zebraExplain_lookupSU (ZebraExplainInfo zei, int set, int use)
+int zebraExplain_lookup_attr_su_any_index(ZebraExplainInfo zei,
+ int set, int use)
{
struct zebSUInfoB *zsui;
assert (zei->curDatabaseInfo);
for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
zsui; zsui=zsui->next)
- if (zsui->info.use == use && zsui->info.set == set)
+ if (zsui->info.which == ZEB_SU_SET_USE &&
+ zsui->info.u.su.use == use && zsui->info.u.su.set == set)
return zsui->info.ordinal;
return -1;
}
+int zebraExplain_lookup_attr_su(ZebraExplainInfo zei, int index_type,
+ int set, int use)
+{
+ struct zebSUInfoB *zsui;
+
+ assert (zei->curDatabaseInfo);
+ for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
+ zsui; zsui=zsui->next)
+ if (zsui->info.index_type == index_type &&
+ zsui->info.which == ZEB_SU_SET_USE &&
+ zsui->info.u.su.use == use && zsui->info.u.su.set == set)
+ return zsui->info.ordinal;
+ return -1;
+}
+
+int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type,
+ const char *str)
+{
+ struct zebSUInfoB *zsui;
+
+ assert (zei->curDatabaseInfo);
+ for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
+ zsui; zsui=zsui->next)
+ if (zsui->info.index_type == index_type &&
+ zsui->info.which == ZEB_SU_STR && !strcmp(zsui->info.u.str, str))
+ return zsui->info.ordinal;
+ return -1;
+}
+
+int zebraExplain_trav_ord(ZebraExplainInfo zei, void *handle,
+ int (*f)(void *handle, int ord))
+{
+ struct zebDatabaseInfoB *zdb = zei->curDatabaseInfo;
+ if (zdb)
+ {
+ struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo;
+ for ( ;zsui; zsui = zsui->next)
+ (*f)(handle, zsui->info.ordinal);
+ }
+ return 0;
+}
+
int zebraExplain_lookup_ord (ZebraExplainInfo zei, int ord,
- const char **db, int *set, int *use)
+ int *index_type,
+ const char **db,
+ int *set, int *use)
{
struct zebDatabaseInfoB *zdb;
for (zdb = zei->databaseInfo; zdb; zdb = zdb->next)
for ( ;zsui; zsui = zsui->next)
if (zsui->info.ordinal == ord)
{
- *db = zdb->databaseName;
- *set = zsui->info.set;
- *use = zsui->info.use;
+ if (db)
+ *db = zdb->databaseName;
+ if (zsui->info.which == ZEB_SU_SET_USE)
+ {
+ if (set)
+ *set = zsui->info.u.su.set;
+ if (use)
+ *use = zsui->info.u.su.use;
+ }
+ if (index_type)
+ *index_type = zsui->info.index_type;
return 0;
}
}
}
}
-int zebraExplain_addSU (ZebraExplainInfo zei, int set, int use)
+int zebraExplain_add_attr_su(ZebraExplainInfo zei, int index_type,
+ int set, int use)
{
struct zebSUInfoB *zsui;
assert (zei->curDatabaseInfo);
- for (zsui = zei->curDatabaseInfo->attributeDetails->SUInfo;
- zsui; zsui=zsui->next)
- if (zsui->info.use == use && zsui->info.set == set)
- return -1;
zebraExplain_addAttributeSet (zei, set);
zsui = (struct zebSUInfoB *) nmem_malloc (zei->nmem, sizeof(*zsui));
zsui->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
zei->curDatabaseInfo->attributeDetails->dirty = 1;
zei->dirty = 1;
- zsui->info.set = set;
- zsui->info.use = use;
+ zsui->info.index_type = index_type;
+ zsui->info.which = ZEB_SU_SET_USE;
+ zsui->info.u.su.set = set;
+ zsui->info.u.su.use = use;
+ zsui->info.ordinal = (zei->ordinalSU)++;
+ return zsui->info.ordinal;
+}
+
+int zebraExplain_add_attr_str(ZebraExplainInfo zei, int index_type,
+ const char *index_name)
+{
+ struct zebSUInfoB *zsui;
+
+ assert (zei->curDatabaseInfo);
+ zsui = (struct zebSUInfoB *) nmem_malloc (zei->nmem, sizeof(*zsui));
+ zsui->next = zei->curDatabaseInfo->attributeDetails->SUInfo;
+ zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
+ zei->curDatabaseInfo->attributeDetails->dirty = 1;
+ zei->dirty = 1;
+ zsui->info.index_type = index_type;
+ zsui->info.which = ZEB_SU_STR;
+ zsui->info.u.str = nmem_strdup(zei->nmem, index_name);
zsui->info.ordinal = (zei->ordinalSU)++;
return zsui->info.ordinal;
}
}
}
-int zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
+zint zebraExplain_runNumberIncrement (ZebraExplainInfo zei, int adjust_num)
{
if (adjust_num)
{
zei->dirty = 1;
- yaz_log (LOG_LOG, "zinfo run number=%d", zei->runNumber+adjust_num);
}
return zei->runNumber += adjust_num;
}
recordAttr->recordSize = 0;
recordAttr->recordOffset = 0;
recordAttr->runNumber = zei->runNumber;
+ recordAttr->staticrank = 0;
return recordAttr;
}
{
data1_handle dh = (data1_handle) p;
if (!data1_get_attset (dh, name))
- logf (LOG_WARN, "Directive attset failed for %s", name);
+ yaz_log (YLOG_WARN, "Directive attset failed for %s", name);
}
void zebraExplain_loadAttsets (data1_handle dh, Res res)
projects / idzebra-moved-to-github.git / blobdiff