X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.c;h=8971d89ec2cb58fbf2deb539534df83ad66a19bf;hb=0a667d16ee52f85592f6cb73ce9a3915409f1c7b;hp=908fdd3c59d9e9d3c6ea465c06c42d3fc561f1ad;hpb=b88909df16157ed1e7859bc3fad6b01520d4865e;p=idzebra-moved-to-github.git diff --git a/index/zinfo.c b/index/zinfo.c index 908fdd3..8971d89 100644 --- a/index/zinfo.c +++ b/index/zinfo.c @@ -1,4 +1,4 @@ -/* $Id: zinfo.c,v 1.66 2006-06-13 12:02:12 adam Exp $ +/* $Id: zinfo.c,v 1.74 2006-11-27 10:09:48 adam Exp $ Copyright (C) 1995-2006 Index Data ApS @@ -15,9 +15,9 @@ 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. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include @@ -33,6 +33,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA struct zebSUInfo { int index_type; + zinfo_index_category_t cat; #define ZEB_SU_SET_USE 1 #define ZEB_SU_STR 2 int which; @@ -52,7 +53,7 @@ struct zebSUInfoB { typedef struct zebAccessObjectB *zebAccessObject; struct zebAccessObjectB { void *handle; - SYSNO sysno; + zint sysno; Odr_oid *oid; zebAccessObject next; }; @@ -65,7 +66,7 @@ struct zebAccessInfoB { typedef struct { struct zebSUInfoB *SUInfo; - SYSNO sysno; + zint sysno; int dirty; int readFlag; data1_node *data1_tree; @@ -78,7 +79,7 @@ struct zebDatabaseInfoB { 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; @@ -93,7 +94,7 @@ struct zebraExplainAttset { struct zebraCategoryListInfo { int dirty; - SYSNO sysno; + zint sysno; data1_node *data1_categoryList; }; @@ -142,7 +143,7 @@ static void zebraExplain_writeCategoryList(ZebraExplainInfo zei, int key_flush); -static Record createRecord(Records records, SYSNO *sysno) +static Record createRecord(Records records, zint *sysno) { Record rec; if (*sysno) @@ -490,7 +491,7 @@ ZebraExplainInfo zebraExplain_open( yaz_log(YLOG_DEBUG, "read runnumber=" ZINT_FORMAT, zei->runNumber); *zdip = NULL; } - rec_rm(&trec); + rec_free(&trec); } else /* create initial targetInfo */ { @@ -542,7 +543,7 @@ ZebraExplainInfo zebraExplain_open( trec->size[recInfo_storeData] = sgml_len; rec_put(records, &trec); - rec_rm(&trec); + rec_free(&trec); } zebraExplain_newDatabase(zei, "IR-Explain-1", 0); @@ -593,6 +594,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, data1_node *node_str = NULL; data1_node *node_ordinal = NULL; data1_node *node_type = NULL; + data1_node *node_cat = NULL; data1_node *node_doc_occurrences = NULL; data1_node *node_term_occurrences = NULL; data1_node *np2; @@ -610,6 +612,8 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, node_ordinal = np2->child; else if (!strcmp(np2->u.tag.tag, "type")) node_type = np2->child; + else if (!strcmp(np2->u.tag.tag, "cat")) + node_cat = np2->child; else if (!strcmp(np2->u.tag.tag, "dococcurrences")) node_doc_occurrences = np2->child; else if (!strcmp(np2->u.tag.tag, "termoccurrences")) @@ -632,6 +636,31 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, yaz_log(YLOG_WARN, "Missing attribute 'type' in attribute info"); (*zsuip)->info.index_type = 'w'; } + if (node_cat && node_cat->u.data.len > 0) + { + zinfo_index_category_t cat; + + data1_node *np = node_cat; + if (!strncmp(np->u.data.data, "index", np->u.data.len)) + cat = zinfo_index_category_index; + else if (!strncmp(np->u.data.data, "sort", np->u.data.len)) + cat = zinfo_index_category_sort; + else if (!strncmp(np->u.data.data, "alwaysmatches", + np->u.data.len)) + cat = zinfo_index_category_alwaysmatches; + else if (!strncmp(np->u.data.data, "anchor", + np->u.data.len)) + cat = zinfo_index_category_anchor; + else + { + yaz_log(YLOG_WARN, "Bad index cateogry '%.*s'", + np->u.data.len, np->u.data.data); + cat = zinfo_index_category_index; + } + (*zsuip)->info.cat = cat; + } + else + (*zsuip)->info.cat = zinfo_index_category_index; if (node_doc_occurrences) { @@ -664,7 +693,7 @@ static void zebraExplain_readAttributeDetails(ZebraExplainInfo zei, } *zsuip = NULL; zad->readFlag = 0; - rec_rm (&rec); + rec_free(&rec); } static void zebraExplain_readDatabase (ZebraExplainInfo zei, @@ -709,7 +738,7 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei, np->child->u.data.len); } zdi->readFlag = 0; - rec_rm (&rec); + rec_free(&rec); } int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle) @@ -733,12 +762,12 @@ int zebraExplain_removeDatabase(ZebraExplainInfo zei, void *update_handle) rec = rec_get(zei->records, zad->sysno); (*zei->updateFunc)(zei->updateHandle, rec, 0); - rec_rm(&rec); + rec_free(&rec); } /* remove database record keys and delete it */ rec = rec_get (zei->records, zdi->sysno); (*zei->updateFunc)(zei->updateHandle, rec, 0); - rec_rm(&rec); + rec_free(&rec); /* remove from list */ *zdip = zdi->next; @@ -826,8 +855,7 @@ static void zebraExplain_updateAccessInfo (ZebraExplainInfo zei, data1_node *n, if (!c) { data1_pr_tree (zei->dh, n, stdout); - exit (0); - assert (c); + zebra_exit("zebraExplain_updateAccessInfo"); } if ((p = accessInfo->attributeSetIds)) @@ -935,6 +963,8 @@ int zebraExplain_newDatabase (ZebraExplainInfo zei, const char *database, zebraExplain_initCommonInfo (zei, node_adinfo); + data1_mk_tag_data_text(zei->dh, node_adinfo, "name", database, zei->nmem); + return 0; } @@ -948,7 +978,7 @@ static void zebraExplain_writeCategoryList (ZebraExplainInfo zei, int i; Record drec; data1_node *node_ci, *node_categoryList; - SYSNO sysno = 0; + zint sysno = 0; static char *category[] = { "CategoryList", "TargetInfo", @@ -1020,6 +1050,7 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, 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); @@ -1031,9 +1062,6 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, "/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) @@ -1067,6 +1095,21 @@ static void zebraExplain_writeAttributeDetails (ZebraExplainInfo zei, zsui->info.doc_occurrences, zei->nmem); data1_mk_tag_data_zint (zei->dh, node_attr, "termoccurrences", zsui->info.term_occurrences, zei->nmem); + switch(zsui->info.cat) + { + case zinfo_index_category_index: + data1_mk_tag_data_text (zei->dh, node_attr, "cat", + "index", zei->nmem); break; + case zinfo_index_category_sort: + data1_mk_tag_data_text (zei->dh, node_attr, "cat", + "sort", zei->nmem); break; + case zinfo_index_category_alwaysmatches: + data1_mk_tag_data_text (zei->dh, node_attr, "cat", + "alwaysmatches", zei->nmem); break; + case zinfo_index_category_anchor: + data1_mk_tag_data_text (zei->dh, node_attr, "cat", + "anchor", zei->nmem); break; + } } /* convert to "SGML" and write it */ #if ZINFO_DEBUG @@ -1306,7 +1349,9 @@ static void zebraExplain_writeTarget (ZebraExplainInfo zei, int key_flush) rec_put (zei->records, &trec); } -int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type, +int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, + zinfo_index_category_t cat, + int index_type, const char *str) { struct zebSUInfoB **zsui; @@ -1314,9 +1359,10 @@ int zebraExplain_lookup_attr_str(ZebraExplainInfo zei, int index_type, 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 - && !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; @@ -1489,6 +1535,7 @@ void zebraExplain_addAttributeSet (ZebraExplainInfo zei, int set) } struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, + zinfo_index_category_t cat, int index_type) { struct zebSUInfoB *zsui; @@ -1500,16 +1547,19 @@ struct zebSUInfoB *zebraExplain_add_sui_info(ZebraExplainInfo zei, zei->curDatabaseInfo->attributeDetails->dirty = 1; zei->dirty = 1; zsui->info.index_type = index_type; + zsui->info.cat = cat; zsui->info.doc_occurrences = 0; zsui->info.term_occurrences = 0; zsui->info.ordinal = (zei->ordinalSU)++; return zsui; } -int zebraExplain_add_attr_str(ZebraExplainInfo zei, int index_type, +int zebraExplain_add_attr_str(ZebraExplainInfo zei, + zinfo_index_category_t cat, + int index_type, const char *index_name) { - struct zebSUInfoB *zsui = zebraExplain_add_sui_info(zei, index_type); + 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); @@ -1561,6 +1611,8 @@ RecordAttr *rec_init_attr (ZebraExplainInfo zei, Record rec) 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);