X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=0b21deaa839155e18ab6a357dbe9e8e16b35ede3;hb=dbf7ead21f60be189f0d532175c92924a8eb73fd;hp=bc0c97423542c45a537250c5615ed19b6f6b001a;hpb=c4e6b0ddb98fc8442bd1ec2b0f4340e99bea18cc;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index bc0c974..0b21dea 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -2,7 +2,7 @@ * Copyright (C) 1994-2002, Index Data * All rights reserved. * - * $Id: recgrs.c,v 1.52 2002-07-02 20:20:09 adam Exp $ + * $Id: recgrs.c,v 1.56 2002-08-01 08:53:35 adam Exp $ */ #include @@ -105,6 +105,16 @@ static void grs_destroy(void *clientData) xfree (h); } +/* use + 1 start element (tag) + 2 end element + 3 start attr (and attr-exact) + 4 end attr + + 1016 cdata + 1015 attr data +*/ + static void index_xpath (data1_node *n, struct recExtractCtrl *p, int level, RecWord *wrd, int use) { @@ -146,20 +156,12 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, tag_path_full[flen++] = '/'; } else if (nn->which == DATA1N_root) - { - size_t tlen = strlen(nn->u.root.type); - if (tlen + flen > (sizeof(tag_path_full)-2)) - return; - memcpy (tag_path_full + flen, nn->u.root.type, tlen); - flen += tlen; - tag_path_full[flen++] = '/'; break; - } } wrd->reg_type = '0'; wrd->string = tag_path_full; wrd->length = flen; - wrd->attrSet = VAL_IDXPATH, + wrd->attrSet = VAL_IDXPATH; wrd->attrUse = use; if (p->flagShowRecords) { @@ -172,7 +174,59 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, } else { + data1_xattr *xp; (*p->tokenAdd)(wrd); + + for (xp = n->u.tag.attributes; xp; xp = xp->next) + { + char comb[512]; + + if (use == 1) + { /* attribute start */ + wrd->reg_type = '0'; + wrd->attrUse = 3; + wrd->string = xp->name; + wrd->length = strlen(xp->name); + + wrd->seqno--; + (*p->tokenAdd)(wrd); + } + + if (use == 1 && xp->value && + strlen(xp->name) + strlen(xp->value) < sizeof(comb)-2) + { + /* attribute value exact */ + strcpy (comb, xp->name); + strcat (comb, "="); + strcat (comb, xp->value); + + wrd->attrUse = 3; + wrd->reg_type = '0'; + wrd->string = comb; + wrd->length = strlen(comb); + wrd->seqno--; + + (*p->tokenAdd)(wrd); + + /* attribute value phrase */ + + wrd->attrUse = 1015; + wrd->reg_type = 'w'; + wrd->string = xp->value; + wrd->length = strlen(xp->value); + + (*p->tokenAdd)(wrd); + } + if (use == 2) + { + wrd->reg_type = '0'; + wrd->attrUse = 4; + wrd->string = xp->name; + wrd->length = strlen(xp->name); + + (*p->tokenAdd)(wrd); + } + } } break; } @@ -366,6 +420,7 @@ int grs_extract_tree(struct recExtractCtrl *p, data1_node *n) (*p->schemaAdd)(p, oidtmp); } (*p->init)(p, &wrd); + return dumpkeys(n, p, 0, &wrd); } @@ -403,9 +458,14 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p, if ((oid_ent_to_oid (&oe, oidtmp))) (*p->schemaAdd)(p, oidtmp); } + + /* ensure our data1 tree is UTF-8 */ + data1_iconv (p->dh, mem, n, "UTF-8", data1_get_encoding(p->dh, n)); + #if 0 data1_pr_tree (p->dh, n, stdout); #endif + (*p->init)(p, &wrd); if (dumpkeys(n, p, 0, &wrd) < 0) { @@ -502,9 +562,33 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) } } +static void add_idzebra_info (struct recRetrieveCtrl *p, data1_node *top, + NMEM mem) +{ + const char *idzebra_ns[7]; + + idzebra_ns[0] = "xmlns:idzebra"; + idzebra_ns[1] = "http://www.indexdata.dk/zebra/"; + idzebra_ns[2] = 0; + + data1_tag_add_attr (p->dh, mem, top, idzebra_ns); + + data1_mk_tag_data_int (p->dh, top, "idzebra:size", p->recordSize, + mem); + if (p->score != -1) + data1_mk_tag_data_int (p->dh, top, "idzebra:score", + p->score, mem); + + data1_mk_tag_data_int (p->dh, top, "idzebra:localnumber", p->localno, + mem); + if (p->fname) + data1_mk_tag_data_text(p->dh, top, "idzebra:filename", + p->fname, mem); +} + static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) { - data1_node *node = 0, *onode = 0; + data1_node *node = 0, *onode = 0, *top; data1_node *dnew; data1_maptab *map; int res, selected = 0; @@ -539,11 +623,16 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) nmem_destroy (mem); return 0; } + /* ensure our data1 tree is UTF-8 */ + data1_iconv (p->dh, mem, node, "UTF-8", data1_get_encoding(p->dh, node)); + #if 0 data1_pr_tree (p->dh, node, stdout); #endif + top = data1_get_root_tag (p->dh, node); + logf (LOG_DEBUG, "grs_retrieve: size"); - if ((dnew = data1_mk_tag_data_wd(p->dh, node, "size", mem))) + if ((dnew = data1_mk_tag_data_wd(p->dh, top, "size", mem))) { dnew->u.data.what = DATA1I_text; dnew->u.data.data = dnew->lbuf; @@ -553,7 +642,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) tagname = res_get_def(p->res, "tagrank", "rank"); if (strcmp(tagname, "0") && p->score >= 0 && - (dnew = data1_mk_tag_data_wd(p->dh, node, tagname, mem))) + (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) { logf (LOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_num; @@ -564,11 +653,12 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) tagname = res_get_def(p->res, "tagsysno", "localControlNumber"); if (strcmp(tagname, "0") && p->localno > 0 && - (dnew = data1_mk_tag_data_wd(p->dh, node, tagname, mem))) + (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) { logf (LOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_text; dnew->u.data.data = dnew->lbuf; + sprintf(dnew->u.data.data, "%d", p->localno); dnew->u.data.len = strlen(dnew->u.data.data); } @@ -686,27 +776,19 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) else if (p->comp && !res) selected = 1; -#if 0 +#if 1 data1_pr_tree (p->dh, node, stdout); #endif logf (LOG_DEBUG, "grs_retrieve: transfer syntax mapping"); switch (p->output_format = (p->input_format != VAL_NONE ? p->input_format : VAL_SUTRS)) { - case VAL_TEXT_XML: - data1_mk_tag_data_int (p->dh, node, "idzebra:size", p->recordSize, - mem); - if (p->score != -1) - data1_mk_tag_data_int (p->dh, node, "idzebra:score", - p->score, mem); - - data1_mk_tag_data_int (p->dh, node, "idzebra:localnumber", p->localno, - mem); - if (p->fname) - data1_mk_tag_data_text(p->dh, node, "idzebra:filename", - p->fname, mem); - + add_idzebra_info (p, top, mem); + + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); + if (!(p->rec_buf = data1_nodetoidsgml(p->dh, node, selected, &p->rec_len))) p->diagnostic = 238; @@ -740,6 +822,8 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) p->rec_len = (size_t) (-1); break; case VAL_SUTRS: + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, &p->rec_len))) p->diagnostic = 238; @@ -776,6 +860,8 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) p->diagnostic = 238; break; } + if (p->encoding) + data1_iconv (p->dh, mem, node, p->encoding, "UTF-8"); if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, selected, &p->rec_len))) p->diagnostic = 238;