X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=494b916ff4dd7b125a4a05dd74ced9707fdd20dc;hb=00796628a5c7dec56efe81be9cf781bb98afc47d;hp=1531b048421e68360381f857b2e5e9d3779b0ba0;hpb=5f8ba9f35bd3c9aeafe26613021f2edd141b8611;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 1531b04..494b916 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -4,7 +4,21 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.c,v $ - * Revision 1.8 1997-09-09 13:38:14 adam + * Revision 1.12 1997-10-29 12:02:22 adam + * Using oid_ent_to_oid used instead of the non thread-safe oid_getoidbyent. + * + * Revision 1.11 1997/10/27 14:34:00 adam + * Work on generic character mapping depending on "structure" field + * in abstract syntax file. + * + * Revision 1.10 1997/09/18 08:59:21 adam + * Extra generic handle for the character mapping routines. + * + * Revision 1.9 1997/09/17 12:19:21 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.8 1997/09/09 13:38:14 adam * Partial port to WIN95/NT. * * Revision 1.7 1997/09/05 15:30:10 adam @@ -166,8 +180,8 @@ static void grs_init(void) { } -static void dumpkeys_word(data1_node *n, struct recExtractCtrl *p, - data1_att *att) +static void dumpkeys_incomplete_field(data1_node *n, struct recExtractCtrl *p, + data1_att *att, int reg_type) { const char *b = n->u.data.data; int remain; @@ -175,7 +189,7 @@ static void dumpkeys_word(data1_node *n, struct recExtractCtrl *p, remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); while (map) { @@ -188,7 +202,7 @@ static void dumpkeys_word(data1_node *n, struct recExtractCtrl *p, { remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); else map = 0; } @@ -203,7 +217,7 @@ static void dumpkeys_word(data1_node *n, struct recExtractCtrl *p, buf[i++] = *(cp++); remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); else map = 0; } @@ -211,17 +225,17 @@ static void dumpkeys_word(data1_node *n, struct recExtractCtrl *p, return; buf[i] = '\0'; (*p->init)(&wrd); /* set defaults */ - wrd.which = Word_String; + wrd.reg_type = reg_type; wrd.seqno = seqno++; - wrd.u.string = buf; + wrd.string = buf; wrd.attrSet = att->parent->ordinal; wrd.attrUse = att->locals->local; (*p->add)(&wrd); } } -static void dumpkeys_phrase(data1_node *n, struct recExtractCtrl *p, - data1_att *att) +static void dumpkeys_complete_field(data1_node *n, struct recExtractCtrl *p, + data1_att *att, int reg_type) { const char *b = n->u.data.data; char buf[GRS_MAX_WORD+1]; @@ -231,7 +245,7 @@ static void dumpkeys_phrase(data1_node *n, struct recExtractCtrl *p, remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input (p->zebra_maps, reg_type, &b, remain); while (remain > 0 && i < GRS_MAX_WORD) { @@ -239,7 +253,7 @@ static void dumpkeys_phrase(data1_node *n, struct recExtractCtrl *p, { remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); else map = 0; } @@ -258,7 +272,7 @@ static void dumpkeys_phrase(data1_node *n, struct recExtractCtrl *p, buf[i++] = *(cp++); remain = n->u.data.len - (b - n->u.data.data); if (remain > 0) - map = (*p->map_chrs_input)(&b, remain); + map = zebra_maps_input (p->zebra_maps, reg_type, &b, remain); else map = 0; } @@ -267,9 +281,10 @@ static void dumpkeys_phrase(data1_node *n, struct recExtractCtrl *p, return; buf[i] = '\0'; (*p->init)(&wrd); - wrd.which = Word_Phrase; + + wrd.reg_type = reg_type; wrd.seqno = seqno++; - wrd.u.string = buf; + wrd.string = buf; wrd.attrSet = att->parent->ordinal; wrd.attrUse = att->locals->local; (*p->add)(&wrd); @@ -322,8 +337,9 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) if (n->which == DATA1N_data) { - data1_node *par = get_parent_tag(n); + data1_node *par = get_parent_tag(p->dh, n); data1_termlist *tlist = 0; + data1_datatype dtype = DATA1K_string; if (p->flagShowRecords) { @@ -346,40 +362,30 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) */ while (!par->u.tag.element) - if (!par->parent || !(par = get_parent_tag(par->parent))) + if (!par->parent || !(par=get_parent_tag(p->dh, par->parent))) break; - if (!par) - tlist = 0; - else if (par->u.tag.element->termlists) - tlist = par->u.tag.element->termlists; - else + if (!par || !(tlist = par->u.tag.element->termlists)) continue; - + if (par->u.tag.element->tag) + dtype = par->u.tag.element->tag->kind; for (; tlist; tlist = tlist->next) { if (p->flagShowRecords) { - printf("%*sIdx: [", (level + 1) * 4, ""); - switch (tlist->structure) - { - case DATA1S_word: printf("w"); break; - case DATA1S_phrase: printf("p"); break; - default: printf("?"); break; - } - printf("] "); - printf("%s:%s [%d]\n", tlist->att->parent->name, - tlist->att->name, tlist->att->value); - } - else switch (tlist->structure) - { - case DATA1S_word: - dumpkeys_word(n, p, tlist->att); break; - case DATA1S_phrase: - dumpkeys_phrase(n, p, tlist->att); break; - default: - logf(LOG_FATAL, "Bad structure type in dumpkeys"); - abort(); + printf("%*sIdx: [%s]", (level + 1) * 4, "", + tlist->structure); + printf("%s:%s [%d]\n", + tlist->att->parent->name, + tlist->att->name, tlist->att->value); } + else + if (zebra_maps_is_complete (p->zebra_maps, + *tlist->structure)) + dumpkeys_complete_field(n, p, tlist->att, + *tlist->structure); + else + dumpkeys_incomplete_field(n, p, tlist->att, + *tlist->structure); } } if (p->flagShowRecords && n->which == DATA1N_root) @@ -404,16 +410,17 @@ static int grs_extract(struct recExtractCtrl *p) gri.fh = p->fh; gri.offset = p->offset; gri.mem = mem; + gri.dh = p->dh; n = read_grs_type (&gri, p->subType); if (!n) return -1; if (dumpkeys(n, p, 0) < 0) { - data1_free_tree(n); + data1_free_tree(p->dh, n); return -2; } - data1_free_tree(n); + data1_free_tree(p->dh, n); nmem_destroy(mem); return 0; } @@ -421,7 +428,7 @@ static int grs_extract(struct recExtractCtrl *p) /* * Return: -1: Nothing done. 0: Ok. >0: Bib-1 diagnostic. */ -static int process_comp(data1_node *n, Z_RecordComposition *c) +static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) { data1_esetname *eset; Z_Espec1 *espec = 0; @@ -432,7 +439,7 @@ static int process_comp(data1_node *n, Z_RecordComposition *c) case Z_RecordComp_simple: if (c->u.simple->which != Z_ElementSetNames_generic) return 26; /* only generic form supported. Fix this later */ - if (!(eset = data1_getesetbyname(n->u.root.absyn, + if (!(eset = data1_getesetbyname(dh, n->u.root.absyn, c->u.simple->u.generic))) { logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic); @@ -450,8 +457,10 @@ static int process_comp(data1_node *n, Z_RecordComposition *c) switch (p->which) { case Z_ElementSpec_elementSetName: - if (!(eset = data1_getesetbyname(n->u.root.absyn, - p->u.elementSetName))) + if (!(eset = + data1_getesetbyname(dh, + n->u.root.absyn, + p->u.elementSetName))) { logf(LOG_LOG, "Unknown esetname '%s'", p->u.elementSetName); @@ -479,7 +488,7 @@ static int process_comp(data1_node *n, Z_RecordComposition *c) return 26; /* fix */ } if (espec) - return data1_doespec1(n, espec); + return data1_doespec1(dh, n, espec); else return -1; } @@ -500,26 +509,29 @@ static int grs_retrieve(struct recRetrieveCtrl *p) gri.fh = p->fh; gri.offset = 0; gri.mem = mem; + gri.dh = p->dh; node = read_grs_type (&gri, p->subType); -/* node = data1_read_record(p->readf, p->fh, mem); */ if (!node) { p->diagnostic = 2; return 0; } - if (p->score >= 0 && (new = data1_insert_taggeddata(node, node, "rank", - mem))) + if (p->score >= 0 && (new = + data1_insert_taggeddata(p->dh, node, + node, "rank", + mem))) { new->u.data.what = DATA1I_num; - new->u.data.data = new->u.data.lbuf; + new->u.data.data = new->lbuf; sprintf(new->u.data.data, "%d", p->score); new->u.data.len = strlen(new->u.data.data); } - if ((new = data1_insert_taggeddata(node, node, "localControlNumber", mem))) + if ((new = data1_insert_taggeddata(p->dh, node, node, + "localControlNumber", mem))) { new->u.data.what = DATA1I_text; - new->u.data.data = new->u.data.lbuf; + new->u.data.data = new->lbuf; sprintf(new->u.data.data, "%d", p->localno); new->u.data.len = strlen(new->u.data.data); } @@ -528,14 +540,16 @@ static int grs_retrieve(struct recRetrieveCtrl *p) { oident oe; Odr_oid *oid; + int oidtmp[OID_SIZE]; oe.proto = PROTO_Z3950; oe.oclass = CLASS_SCHEMA; oe.value = node->u.root.absyn->reference; - if ((oid = oid_getoidbyent(&oe))) + if ((oid = oid_ent_to_oid (&oe, oidtmp))) { char tmp[128]; + data1_handle dh = p->dh; char *p = tmp; int *ii; @@ -548,8 +562,8 @@ static int grs_retrieve(struct recRetrieveCtrl *p) } *(p++) = '\0'; - if ((new = data1_insert_taggeddata(node, node, "schemaIdentifier", - mem))) + if ((new = data1_insert_taggeddata(dh, node, node, + "schemaIdentifier", mem))) { new->u.data.what = DATA1I_oid; new->u.data.data = nmem_malloc(mem, p - tmp); @@ -570,7 +584,7 @@ static int grs_retrieve(struct recRetrieveCtrl *p) if (map->target_absyn_ref == p->input_format) { onode = node; - if (!(node = data1_map_record(onode, map, mem))) + if (!(node = data1_map_record(p->dh, onode, map, mem))) { p->diagnostic = 14; return 0; @@ -579,12 +593,12 @@ static int grs_retrieve(struct recRetrieveCtrl *p) break; } - if (p->comp && (res = process_comp(node, p->comp)) > 0) + if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0) { p->diagnostic = res; if (onode) - data1_free_tree(onode); - data1_free_tree(node); + data1_free_tree(p->dh, onode); + data1_free_tree(p->dh, node); nmem_destroy(mem); return 0; } @@ -599,25 +613,28 @@ static int grs_retrieve(struct recRetrieveCtrl *p) case VAL_GRS1: dummy = 0; - if (!(p->rec_buf = data1_nodetogr(node, selected, p->odr, &dummy))) + if (!(p->rec_buf = data1_nodetogr(p->dh, node, selected, + p->odr, &dummy))) p->diagnostic = 2; /* this should be better specified */ else p->rec_len = -1; break; case VAL_EXPLAIN: - if (!(p->rec_buf = data1_nodetoexplain(node, selected, p->odr))) + if (!(p->rec_buf = data1_nodetoexplain(p->dh, node, selected, + p->odr))) p->diagnostic = 2; /* this should be better specified */ else p->rec_len = -1; break; case VAL_SUMMARY: - if (!(p->rec_buf = data1_nodetosummary(node, selected, p->odr))) + if (!(p->rec_buf = data1_nodetosummary(p->dh, node, selected, + p->odr))) p->diagnostic = 2; else p->rec_len = -1; break; case VAL_SUTRS: - if (!(p->rec_buf = data1_nodetobuf(node, selected, + if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, (int*)&p->rec_len))) { p->diagnostic = 2; @@ -625,8 +642,8 @@ static int grs_retrieve(struct recRetrieveCtrl *p) } break; case VAL_SOIF: - if (!(p->rec_buf = data1_nodetosoif(node, selected, - (int*)&p->rec_len))) + if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected, + (int*)&p->rec_len))) { p->diagnostic = 2; break; @@ -642,17 +659,18 @@ static int grs_retrieve(struct recRetrieveCtrl *p) p->diagnostic = 227; break; } - if (!(p->rec_buf = data1_nodetomarc(marctab, node, selected, - (int*)&p->rec_len))) + if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, + selected, + (int*)&p->rec_len))) { p->diagnostic = 2; break; } } if (node) - data1_free_tree(node); + data1_free_tree(p->dh, node); if (onode) - data1_free_tree(onode); + data1_free_tree(p->dh, onode); nmem_destroy(mem); return 0; }