X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.c;h=908fdd3c59d9e9d3c6ea465c06c42d3fc561f1ad;hb=b88909df16157ed1e7859bc3fad6b01520d4865e;hp=05b772ad106ef82d9ffc6f9b504b6e7e06ae0b6d;hpb=24031af43eeb85eb33b0c208ee6c6b02144cb799;p=idzebra-moved-to-github.git diff --git a/index/zinfo.c b/index/zinfo.c index 05b772a..908fdd3 100644 --- a/index/zinfo.c +++ b/index/zinfo.c @@ -1,4 +1,4 @@ -/* $Id: zinfo.c,v 1.61 2006-05-10 13:46:55 adam Exp $ +/* $Id: zinfo.c,v 1.66 2006-06-13 12:02:12 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -38,10 +38,6 @@ struct zebSUInfo { int which; union { char *str; - struct { - int set; - int use; - } su; } u; int ordinal; zint doc_occurrences; @@ -118,7 +114,7 @@ struct zebraExplainInfo { struct zebDatabaseInfoB *curDatabaseInfo; zebAccessInfo accessInfo; char date[15]; /* YYYY MMDD HH MM SS */ - int (*updateFunc)(void *handle, Record drec, data1_node *n); + ZebraExplainUpdateFunc *updateFunc; void *updateHandle; }; @@ -340,7 +336,7 @@ ZebraExplainInfo zebraExplain_open( Res res, int writeFlag, void *updateHandle, - int (*updateFunc)(void *handle, Record drec, data1_node *n)) + ZebraExplainUpdateFunc *updateFunc) { Record trec; ZebraExplainInfo zei; @@ -363,6 +359,9 @@ ZebraExplainInfo zebraExplain_open( zei->records = records; zei->nmem = nmem; zei->dh = dh; + + data1_get_absyn (zei->dh, "explain", DATA1_XPATH_INDEXING_DISABLE); + zei->attsets = NULL; zei->res = res; zei->categoryList = (struct zebraCategoryListInfo *) @@ -591,16 +590,12 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, "attrlist"); for (np = node_list->child; np; np = np->next) { - 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 *node_doc_occurrences = NULL; data1_node *node_term_occurrences = NULL; data1_node *np2; - char oid_str[128]; - int oid_str_len; if (np->which != DATA1N_tag || strcmp(np->u.tag.tag, "attr")) continue; @@ -609,11 +604,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, if (np2->which != DATA1N_tag || !np2->child || np2->child->which != DATA1N_data) continue; - if (!strcmp(np2->u.tag.tag, "set")) - node_set = np2->child; - else if (!strcmp(np2->u.tag.tag, "use")) - node_use = np2->child; - else if (!strcmp(np2->u.tag.tag, "str")) + if (!strcmp(np2->u.tag.tag, "str")) node_str = np2->child; else if (!strcmp(np2->u.tag.tag, "ordinal")) node_ordinal = np2->child; @@ -654,25 +645,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, (*zsuip)->info.term_occurrences = atoi_zn(np->u.data.data, np->u.data.len); } - 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) + if (node_str) { (*zsuip)->info.which = ZEB_SU_STR; @@ -965,32 +938,6 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database, return 0; } -static void writeAttributeValueDetails (ZebraExplainInfo zei, - zebAttributeDetails zad, - data1_node *node_atvs, data1_attset *attset) - -{ - struct zebSUInfoB *zsui; - int set_ordinal = attset->reference; - data1_attset_child *c; - - for (c = attset->children; c; c = c->next) - writeAttributeValueDetails (zei, zad, node_atvs, c->child); - for (zsui = zad->SUInfo; zsui; zsui = zsui->next) - { - 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); - } - } -} static void zebraExplain_writeCategoryList (ZebraExplainInfo zei, struct zebraCategoryListInfo *zcl, @@ -1064,9 +1011,8 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, char *sgml_buf; int sgml_len; Record drec; - data1_node *node_adinfo, *node_list, *node_zebra, *node_attributesBySet; + data1_node *node_adinfo, *node_list, *node_zebra; struct zebSUInfoB *zsui; - int set_min; if (!zad->dirty) return; @@ -1092,65 +1038,6 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, record count, etc. is affected */ if (key_flush) (*zei->updateFunc)(zei->updateHandle, drec, zad->data1_tree); - - node_attributesBySet = data1_mk_tag_uni (zei->dh, zei->nmem, - "attributesBySet", node_adinfo); - set_min = -1; - while (1) - { - data1_node *node_asd; - data1_attset *attset; - int set_ordinal = -1; - for (zsui = zad->SUInfo; zsui; zsui = zsui->next) - { - 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; - set_min = set_ordinal; - node_asd = data1_mk_tag (zei->dh, zei->nmem, - "attributeSetDetails", - 0 /* attr */, node_attributesBySet); - - attset = data1_attset_search_id (zei->dh, set_ordinal); - if (!attset) - { - zebraExplain_loadAttsets (zei->dh, zei->res); - attset = data1_attset_search_id (zei->dh, set_ordinal); - } - if (attset) - { - int oid[OID_SIZE]; - oident oe; - - oe.proto = PROTO_Z3950; - oe.oclass = CLASS_ATTSET; - oe.value = (enum oid_value) set_ordinal; - - if (oid_ent_to_oid (&oe, oid)) - { - data1_node *node_abt, *node_atd, *node_atvs; - data1_mk_tag_data_oid (zei->dh, node_asd, "oid", - oid, zei->nmem); - - node_abt = data1_mk_tag (zei->dh, zei->nmem, - "attributesByType", - 0 /*attr */, node_asd); - node_atd = data1_mk_tag (zei->dh, zei->nmem, - "attributeTypeDetails", - 0 /* attr */, node_abt); - data1_mk_tag_data_int (zei->dh, node_atd, - "type", 1, zei->nmem); - node_atvs = data1_mk_tag (zei->dh, zei->nmem, - "attributeValues", - 0 /* attr */, node_atd); - writeAttributeValueDetails (zei, zad, node_atvs, attset); - } - } - } /* zebra info (private) */ node_zebra = data1_mk_tag_uni (zei->dh, zei->nmem, "zebraInfo", node_adinfo); @@ -1158,11 +1045,8 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, "attrlist", node_zebra); for (zsui = zad->SUInfo; zsui; zsui = zsui->next) { - 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); @@ -1171,19 +1055,7 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, 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) + if (zsui->info.which == ZEB_SU_STR) { data1_mk_tag_data_text (zei->dh, node_attr, "str", zsui->info.u.str, zei->nmem); @@ -1434,48 +1306,6 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush) rec_put (zei->records, &trec); } -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.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; - -#if 0 - yaz_log(YLOG_LOG, "lookup_attr_su index_type=%d set=%d use=%d", - index_type, set, use); -#endif - 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) - { - struct zebSUInfoB *zsui_this = *zsui; - - /* take it out of the list and move to front */ - *zsui = (*zsui)->next; - zsui_this->next = zei->curDatabaseInfo->attributeDetails->SUInfo; - zei->curDatabaseInfo->attributeDetails->SUInfo = zsui_this; - - return zsui_this->info.ordinal; - } - return -1; -} - int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type, const char *str) { @@ -1486,7 +1316,7 @@ int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type, *zsui; zsui = &(*zsui)->next) if ((*zsui)->info.index_type == index_type && (*zsui)->info.which == ZEB_SU_STR - && !strcmp((*zsui)->info.u.str, str)) + && !yaz_matchstr((*zsui)->info.u.str, str)) { struct zebSUInfoB *zsui_this = *zsui; @@ -1577,18 +1407,29 @@ int zebraExplain_ord_get_occurrences(ZebraExplainInfo zei, int ord, return -1; } +zint zebraExplain_ord_get_doc_occurrences(ZebraExplainInfo zei, int ord) +{ + struct zebSUInfoB *zsui = zebraExplain_get_sui_info(zei, ord, 0, 0); + if (zsui) + return zsui->info.doc_occurrences; + return 0; +} + +zint zebraExplain_ord_get_term_occurrences(ZebraExplainInfo zei, int ord) +{ + struct zebSUInfoB *zsui = zebraExplain_get_sui_info(zei, ord, 0, 0); + if (zsui) + return zsui->info.term_occurrences; + return 0; +} + int zebraExplain_lookup_ord(ZebraExplainInfo zei, int ord, int *index_type, const char **db, - int *set, int *use, const char **string_index) { struct zebSUInfoB *zsui; - if (set) - *set = -1; - if (use) - *use = -1; if (index_type) *index_type = 0; if (string_index) @@ -1597,18 +1438,9 @@ 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_SET_USE) - { - if (set) - *set = zsui->info.u.su.set; - if (use) - *use = zsui->info.u.su.use; - } - if (zsui->info.which == ZEB_SU_STR) if (string_index) *string_index = zsui->info.u.str; - if (index_type) *index_type = zsui->info.index_type; return 0; @@ -1674,18 +1506,6 @@ struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, return zsui; } -int zebraExplain_add_attr_su(ZebraExplainInfo zei, int index_type, - int set, int use) -{ - struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, index_type); - - zebraExplain_addAttributeSet (zei, set); - 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, int index_type, const char *index_name) {