-/* $Id: zinfo.c,v 1.45 2005-03-05 09:19:14 adam Exp $
+/* $Id: zinfo.c,v 1.51 2005-08-30 12:23:02 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
#define ZINFO_DEBUG 0
struct zebSUInfo {
+ int index_type;
#define ZEB_SU_SET_USE 1
#define ZEB_SU_STR 2
int which;
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;
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_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_ordinal);
*zsuip = (struct zebSUInfoB *)
nmem_malloc (zei->nmem, sizeof(**zsuip));
+
+ 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;
}
else
{
- yaz_log(YLOG_WARN, "Missng set/use/str in attribute info");
+ yaz_log(YLOG_WARN, "Missing set/use/str in attribute info");
continue;
}
(*zsuip)->info.ordinal = atoi_n (node_ordinal->u.data.data,
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);
+
+ 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;
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,
rec_put (zei->records, &trec);
}
-int zebraExplain_lookup_attr_su(ZebraExplainInfo zei, int set, int use)
+int zebraExplain_lookup_attr_su_any_index(ZebraExplainInfo zei,
+ int set, int use)
{
struct zebSUInfoB *zsui;
return -1;
}
-int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, const char *str)
+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.which == ZEB_SU_STR &&
- !strcmp(zsui->info.u.str, str))
+ 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_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)
{
struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo;
for ( ;zsui; zsui = zsui->next)
- if (zsui->info.which == ZEB_SU_SET_USE &&
- zsui->info.ordinal == ord)
+ if (zsui->info.ordinal == ord)
{
- *db = zdb->databaseName;
- *set = zsui->info.u.su.set;
- *use = zsui->info.u.su.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_add_attr_su(ZebraExplainInfo zei, int set, int use)
+int zebraExplain_add_attr_su(ZebraExplainInfo zei, int index_type,
+ int set, int use)
{
struct zebSUInfoB *zsui;
zei->curDatabaseInfo->attributeDetails->SUInfo = zsui;
zei->curDatabaseInfo->attributeDetails->dirty = 1;
zei->dirty = 1;
+ 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;
return zsui->info.ordinal;
}
-int zebraExplain_add_attr_str(ZebraExplainInfo zei, const char *str)
+int zebraExplain_add_attr_str(ZebraExplainInfo zei, int index_type,
+ const char *index_name)
{
struct zebSUInfoB *zsui;
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, str);
+ zsui->info.u.str = nmem_strdup(zei->nmem, index_name);
zsui->info.ordinal = (zei->ordinalSU)++;
return zsui->info.ordinal;
}
recordAttr->recordSize = 0;
recordAttr->recordOffset = 0;
recordAttr->runNumber = zei->runNumber;
+ recordAttr->staticrank = 0;
return recordAttr;
}