X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=recctrl%2Frecgrs.c;h=b4ef25cd00ca9e6c5888aaae385e7bf8627f5815;hb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;hp=9b07e1355f1ce2d455f5dc37c146fb11639191f1;hpb=ec5e593725d0d141d2005c3fc11207bde70912e0;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 9b07e13..b4ef25c 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,10 +1,35 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.c,v $ - * Revision 1.18 1998-03-05 08:41:31 adam + * Revision 1.26 1999-03-02 16:15:44 quinn + * Added "tagsysno" and "tagrank" directives to zebra.cfg. + * + * Revision 1.25 1999/02/18 15:01:26 adam + * Minor changes. + * + * Revision 1.24 1999/02/02 14:51:28 adam + * Updated WIN32 code specific sections. Changed header. + * + * Revision 1.23 1998/10/18 07:51:10 adam + * Changed one logf call. + * + * Revision 1.22 1998/10/16 08:14:37 adam + * Updated record control system. + * + * Revision 1.21 1998/07/01 09:16:10 adam + * Element localno only added when it's greater than 0. + * + * Revision 1.20 1998/05/20 10:12:26 adam + * Implemented automatic EXPLAIN database maintenance. + * Modified Zebra to work with ASN.1 compiled version of YAZ. + * + * Revision 1.19 1998/03/11 11:19:05 adam + * Changed the way sequence numbers are generated. + * + * Revision 1.18 1998/03/05 08:41:31 adam * Minor changes. * * Revision 1.17 1998/02/10 12:03:06 adam @@ -150,7 +175,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif @@ -162,8 +187,6 @@ #define GRS_MAX_WORD 512 -static int seqno = 0; - static data1_node *read_grs_type (struct grs_read_info *p, const char *type) { static struct { @@ -193,7 +216,11 @@ static data1_node *read_grs_type (struct grs_read_info *p, const char *type) return NULL; } -static void grs_init(void) +static void grs_init(RecType recType) +{ +} + +static void grs_destroy(RecType recType) { } @@ -291,13 +318,11 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) else { wrd.reg_type = *tlist->structure; - wrd.seqno = seqno; wrd.string = n->u.data.data; wrd.length = n->u.data.len; - wrd.attrSet = tlist->att->parent->ordinal; + wrd.attrSet = (int) (tlist->att->parent->reference); wrd.attrUse = tlist->att->locals->local; - (*p->add)(&wrd); - seqno = wrd.seqno; + (*p->addWord)(&wrd); } } } @@ -309,12 +334,28 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) return 0; } +int grs_extract_tree(struct recExtractCtrl *p, data1_node *n) +{ + oident oe; + int oidtmp[OID_SIZE]; + + oe.proto = PROTO_Z3950; + oe.oclass = CLASS_SCHEMA; + oe.value = n->u.root.absyn->reference; + + if ((oid_ent_to_oid (&oe, oidtmp))) + (*p->addSchema)(p, oidtmp); + + return dumpkeys(n, p, 0); +} + static int grs_extract(struct recExtractCtrl *p) { data1_node *n; NMEM mem; struct grs_read_info gri; - seqno = 0; + oident oe; + int oidtmp[OID_SIZE]; mem = nmem_create (); gri.readf = p->readf; @@ -329,6 +370,13 @@ static int grs_extract(struct recExtractCtrl *p) n = read_grs_type (&gri, p->subType); if (!n) return -1; + + oe.proto = PROTO_Z3950; + oe.oclass = CLASS_SCHEMA; + oe.value = n->u.root.absyn->reference; + if ((oid_ent_to_oid (&oe, oidtmp))) + (*p->addSchema)(p, oidtmp); + if (dumpkeys(n, p, 0) < 0) { data1_free_tree(p->dh, n); @@ -403,7 +451,7 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) } if (espec) { - logf (LOG_LOG, "Element: Espec-1 match"); + logf (LOG_DEBUG, "Element: Espec-1 match"); return data1_doespec1(dh, n, espec); } else @@ -421,6 +469,7 @@ static int grs_retrieve(struct recRetrieveCtrl *p) int res, selected = 0; NMEM mem; struct grs_read_info gri; + char *tagname; mem = nmem_create(); gri.readf = p->readf; @@ -450,22 +499,24 @@ static int grs_retrieve(struct recRetrieveCtrl *p) dnew->u.data.len = strlen(dnew->u.data.data); } - logf (LOG_DEBUG, "grs_retrieve: score"); - if (p->score >= 0 && (dnew = + tagname = res_get_def(p->res, "tagrank", "rank"); + if (strcmp(tagname, "0") && p->score >= 0 && (dnew = data1_insert_taggeddata(p->dh, node, - node, "rank", + node, tagname, mem))) { + logf (LOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_num; dnew->u.data.data = dnew->lbuf; sprintf(dnew->u.data.data, "%d", p->score); dnew->u.data.len = strlen(dnew->u.data.data); } - logf (LOG_DEBUG, "grs_retrieve: localControlNumber"); - if ((dnew = data1_insert_taggeddata(p->dh, node, node, - "localControlNumber", mem))) + tagname = res_get_def(p->res, "tagsysno", "localControlNumber"); + if (strcmp(tagname, "0") && p->localno > 0 && + (dnew = data1_insert_taggeddata(p->dh, node, node, 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); @@ -578,11 +629,23 @@ static int grs_retrieve(struct recRetrieveCtrl *p) if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, (int*)&p->rec_len))) p->diagnostic = 238; + else + { + char *new_buf = (char*) odr_malloc (p->odr, p->rec_len); + memcpy (new_buf, p->rec_buf, p->rec_len); + p->rec_buf = new_buf; + } break; case VAL_SOIF: if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected, (int*)&p->rec_len))) p->diagnostic = 238; + else + { + char *new_buf = (char*) odr_malloc (p->odr, p->rec_len); + memcpy (new_buf, p->rec_buf, p->rec_len); + p->rec_buf = new_buf; + } break; default: if (!node->u.root.absyn) @@ -602,9 +665,12 @@ static int grs_retrieve(struct recRetrieveCtrl *p) if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, selected, (int*)&p->rec_len))) - { p->diagnostic = 238; - break; + else + { + char *new_buf = (char*) odr_malloc (p->odr, p->rec_len); + memcpy (new_buf, p->rec_buf, p->rec_len); + p->rec_buf = new_buf; } } if (node) @@ -619,6 +685,7 @@ static struct recType grs_type = { "grs", grs_init, + grs_destroy, grs_extract, grs_retrieve };