X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fzinfo.c;h=cfede292629a8ebc0a625772f37ec71fc59e667c;hp=551e2c2467a2d61e8760085d3c56026f1c7851ec;hb=96e4c5479e111511f5df3531b6648931251b9e5d;hpb=09aa21f9fc2a275701c7820a260b75b6323fcc42 diff --git a/index/zinfo.c b/index/zinfo.c index 551e2c2..cfede29 100644 --- a/index/zinfo.c +++ b/index/zinfo.c @@ -1,8 +1,5 @@ -/* $Id: zinfo.c,v 1.79 2007-10-29 11:10:43 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data 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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -32,14 +32,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define ZINFO_DEBUG 0 struct zebSUInfo { - int index_type; + char *index_type; zinfo_index_category_t cat; -#define ZEB_SU_SET_USE 1 -#define ZEB_SU_STR 2 - int which; - union { - char *str; - } u; + char *str; int ordinal; zint doc_occurrences; zint term_occurrences; @@ -642,11 +637,14 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, 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]; + (*zsuip)->info.index_type = + nmem_strdupn(zei->nmem, + node_type->u.data.data, + node_type->u.data.len); else { yaz_log(YLOG_WARN, "Missing attribute 'type' in attribute info"); - (*zsuip)->info.index_type = 'w'; + (*zsuip)->info.index_type = "w"; } if (node_cat && node_cat->u.data.len > 0) { @@ -688,11 +686,9 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, } 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); + (*zsuip)->info.str = nmem_strdupn(zei->nmem, + node_str->u.data.data, + node_str->u.data.len); } else { @@ -774,12 +770,12 @@ int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle) rec = rec_get(zei->records, zad->sysno); (*zei->updateFunc)(zei->updateHandle, rec, 0); - rec_free(&rec); + rec_del(zei->records, &rec); } /* remove database record keys and delete it */ rec = rec_get(zei->records, zdi->sysno); (*zei->updateFunc)(zei->updateHandle, rec, 0); - rec_free(&rec); + rec_del(zei->records, &rec); /* remove from list */ *zdip = zdi->next; @@ -1002,7 +998,7 @@ static void zebraExplain_writeCategoryList(ZebraExplainInfo zei, assert(zcl); if (!zcl->dirty) return ; - zcl->dirty = 1; + zcl->dirty = 0; node_categoryList = zcl->data1_categoryList; #if ZINFO_DEBUG @@ -1087,20 +1083,13 @@ static void zebraExplain_writeAttributeDetails(ZebraExplainInfo zei, for (zsui = zad->SUInfo; zsui; zsui = zsui->next) { 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_STR) - { - data1_mk_tag_data_text(zei->dh, node_attr, "str", - zsui->info.u.str, zei->nmem); - } + zsui->info.index_type, zei->nmem); + data1_mk_tag_data_text(zei->dh, node_attr, "str", + zsui->info.str, zei->nmem); data1_mk_tag_data_int(zei->dh, node_attr, "ordinal", zsui->info.ordinal, zei->nmem); @@ -1364,7 +1353,7 @@ static void zebraExplain_writeTarget(ZebraExplainInfo zei, int key_flush) int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, zinfo_index_category_t cat, - int index_type, + const char *index_type, const char *str) { struct zebSUInfoB **zsui; @@ -1372,10 +1361,10 @@ int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, assert(zei->curDatabaseInfo); for (zsui = &zei->curDatabaseInfo->attributeDetails->SUInfo; *zsui; zsui = &(*zsui)->next) - if ( (index_type == -1 || (*zsui)->info.index_type == index_type) + if ( (index_type == 0 + || !strcmp((*zsui)->info.index_type, index_type)) && (*zsui)->info.cat == cat - && (*zsui)->info.which == ZEB_SU_STR - && !yaz_matchstr((*zsui)->info.u.str, str)) + && !yaz_matchstr((*zsui)->info.str, str)) { struct zebSUInfoB *zsui_this = *zsui; @@ -1390,14 +1379,19 @@ int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, } int zebraExplain_trav_ord(ZebraExplainInfo zei, void *handle, - int (*f)(void *handle, int ord)) + int (*f)(void *handle, int ord, + const char *index_type, + const char *string_index, + zinfo_index_category_t cat)) { struct zebDatabaseInfoB *zdb = zei->curDatabaseInfo; if (zdb) { struct zebSUInfoB *zsui = zdb->attributeDetails->SUInfo; for ( ;zsui; zsui = zsui->next) - (*f)(handle, zsui->info.ordinal); + (*f)(handle, zsui->info.ordinal, + zsui->info.index_type, zsui->info.str, + zsui->info.cat); } return 0; } @@ -1483,7 +1477,7 @@ zint zebraExplain_ord_get_term_occurrences(ZebraExplainInfo zei, int ord) } int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord, - int *index_type, + const char **index_type, const char **db, const char **string_index) { @@ -1497,9 +1491,8 @@ int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord, zsui = zebraExplain_get_sui_info(zei, ord, 0, db); if (zsui) { - if (zsui->info.which == ZEB_SU_STR) - if (string_index) - *string_index = zsui->info.u.str; + if (string_index) + *string_index = zsui->info.str; if (index_type) *index_type = zsui->info.index_type; return 0; @@ -1532,7 +1525,7 @@ zebAccessObject zebraExplain_announceOid(ZebraExplainInfo zei, struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, zinfo_index_category_t cat, - int index_type) + const char *index_type) { struct zebSUInfoB *zsui; @@ -1542,7 +1535,7 @@ struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, zei->curDatabaseInfo->attributeDetails->SUInfo = zsui; zei->curDatabaseInfo->attributeDetails->dirty = 1; zei->dirty = 1; - zsui->info.index_type = index_type; + zsui->info.index_type = nmem_strdup(zei->nmem, index_type); zsui->info.cat = cat; zsui->info.doc_occurrences = 0; zsui->info.term_occurrences = 0; @@ -1552,13 +1545,12 @@ struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, int zebraExplain_add_attr_str(ZebraExplainInfo zei, zinfo_index_category_t cat, - int index_type, + const char *index_type, const char *index_name) { struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, cat, index_type); - zsui->info.which = ZEB_SU_STR; - zsui->info.u.str = nmem_strdup(zei->nmem, index_name); + zsui->info.str = nmem_strdup(zei->nmem, index_name); return zsui->info.ordinal; } @@ -1649,6 +1641,7 @@ void zebraExplain_loadAttsets(data1_handle dh, Res res) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab