X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzinfo.c;h=31f35b845ea0d3474537c326a0b6fb3683f0df13;hb=10e178572346e8c5c3caaa43b803dd10c005cb5f;hp=5ae198bd35c6810f49a27ac767814f0a44631e16;hpb=0d6d7e64c352de4bbb384da16b19f8dcb5aebbae;p=idzebra-moved-to-github.git diff --git a/index/zinfo.c b/index/zinfo.c index 5ae198b..31f35b8 100644 --- a/index/zinfo.c +++ b/index/zinfo.c @@ -1,10 +1,16 @@ /* - * Copyright (C) 1994-1998, Index Data + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zinfo.c,v $ - * Revision 1.13 1998-11-03 10:17:09 adam + * Revision 1.15 1999-01-25 13:47:54 adam + * Fixed bug. + * + * Revision 1.14 1998/11/04 16:31:32 adam + * Fixed bug regarding recordBytes in databaseInfo. + * + * Revision 1.13 1998/11/03 10:17:09 adam * Fixed bug regarding creation of some data1 nodes for Explain records. * * Revision 1.12 1998/10/13 20:37:11 adam @@ -274,7 +280,7 @@ static data1_node *data1_make_tagdata_text (data1_handle dh, data1_node *at, { data1_node *node_data = node->child; node_data->u.data.what = DATA1I_text; - node_data->u.data.len = strlen (node_data->u.data.data); + node_data->u.data.len = strlen (str); node_data->u.data.data = data1_insert_string (dh, node_data, nmem, str); return node_data; @@ -692,9 +698,10 @@ static void zebraExplain_readDatabase (ZebraExplainInfo zei, node_zebra = data1_search_tag (zei->dh, node_dbinfo->child, "zebraInfo"); - np = data1_search_tag (zei->dh, node_dbinfo->child, - "recordBytes"); - if (np && np->child && np->child->which == DATA1N_data) + if (node_zebra + && (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); if ((np = data1_search_tag (zei->dh, node_dbinfo->child, @@ -953,7 +960,7 @@ static void zebraExplain_writeCategoryList (ZebraExplainInfo zei, /* convert to "SGML" and write it */ #if ZINFO_DEBUG - data1_pr_tree (zei->dh, zad->data1_tree, stderr); + data1_pr_tree (zei->dh, node_categoryList, stderr); #endif sgml_buf = data1_nodetoidsgml(zei->dh, node_categoryList, 0, &sgml_len);