X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=8e60bf0ef9f137e8733c7bf441d9e459ac021c25;hp=46821bcbe9a5d9501f7904fd9feb31cc54ef9ff1;hb=1ccf2613ceef2359f589cb3dd7e72a899c618b2f;hpb=687f4b034335c161ed1b7b04275857c7fbc69211 diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 46821bc..8e60bf0 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,10 +1,80 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.c,v $ - * Revision 1.13 1997-10-31 12:35:44 adam + * Revision 1.36 2000-12-05 10:01:44 adam + * Fixed bug regarding user-defined attribute sets. + * + * Revision 1.35 2000/11/29 15:21:31 adam + * Fixed problem with passwd db. + * + * Revision 1.34 2000/02/25 13:24:49 adam + * Fixed bug regarding pointer conversion that showed up on OSF V5. + * + * Revision 1.33 1999/11/30 13:48:04 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.32 1999/09/07 07:19:21 adam + * Work on character mapping. Implemented replace rules. + * + * Revision 1.31 1999/07/14 10:56:43 adam + * Fixed potential memory leak. + * + * Revision 1.30 1999/07/06 12:26:41 adam + * Retrieval handler obeys schema and handles XML transfer syntax. + * + * Revision 1.29 1999/05/26 07:49:14 adam + * C++ compilation. + * + * Revision 1.28 1999/05/21 12:00:17 adam + * Better diagnostics for extraction process. + * + * Revision 1.27 1999/05/20 12:57:18 adam + * Implemented TCL filter. Updated recctrl system. + * + * 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 + * Implemented Sort. + * + * Revision 1.16 1998/01/29 13:38:17 adam + * Fixed problem with mapping to record with unknown schema. + * + * Revision 1.15 1998/01/26 10:37:57 adam + * Better diagnostics. + * + * Revision 1.14 1997/11/06 11:41:01 adam + * Implemented "begin variant" for the sgml.regx filter. + * + * Revision 1.13 1997/10/31 12:35:44 adam * Added a few log statements. * * Revision 1.12 1997/10/29 12:02:22 adam @@ -135,34 +205,35 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif -#include -#include +#include +#include #include -#include #include "grsread.h" #define GRS_MAX_WORD 512 -static int seqno = 0; +struct grs_handler { + RecTypeGrs type; + void *clientData; + int initFlag; + struct grs_handler *next; +}; + +struct grs_handlers { + struct grs_handler *handlers; +}; -static data1_node *read_grs_type (struct grs_read_info *p, const char *type) +static int read_grs_type (struct grs_handlers *h, + struct grs_read_info *p, const char *type, + data1_node **root) { - static struct { - char *type; - data1_node *(*func)(struct grs_read_info *p); - } tab[] = { - { "sgml", grs_read_sgml }, - { "regx", grs_read_regx }, - { "marc", grs_read_marc }, - { NULL, NULL } - }; + struct grs_handler *gh = h->handlers; const char *cp = strchr (type, '.'); - int i; if (cp == NULL || cp == type) { @@ -171,130 +242,67 @@ static data1_node *read_grs_type (struct grs_read_info *p, const char *type) } else strcpy (p->type, cp+1); - for (i=0; tab[i].type; i++) + for (gh = h->handlers; gh; gh = gh->next) { - if (!memcmp (type, tab[i].type, cp-type)) - return (tab[i].func)(p); + if (!memcmp (type, gh->type->type, cp-type)) + { + if (!gh->initFlag) + { + gh->initFlag = 1; + gh->clientData = (*gh->type->init)(); + } + p->clientData = gh->clientData; + *root = (gh->type->read)(p); + gh->clientData = p->clientData; + return 0; + } } - return NULL; + return 1; } -static void grs_init(void) +static void grs_add_handler (struct grs_handlers *h, RecTypeGrs t) { + struct grs_handler *gh = (struct grs_handler *) malloc (sizeof(*gh)); + gh->next = h->handlers; + h->handlers = gh; + gh->initFlag = 0; + gh->clientData = 0; + gh->type = t; } -static void dumpkeys_incomplete_field(data1_node *n, struct recExtractCtrl *p, - data1_att *att, int reg_type) +static void *grs_init(RecType recType) { - const char *b = n->u.data.data; - int remain; - const char **map = 0; - - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); - - while (map) - { - RecWord wrd; - char buf[GRS_MAX_WORD+1]; - int i, remain; + struct grs_handlers *h = (struct grs_handlers *) malloc (sizeof(*h)); + h->handlers = 0; - /* Skip spaces */ - while (map && *map && **map == *CHR_SPACE) - { - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); - else - map = 0; - } - if (!map) - break; - i = 0; - while (map && *map && **map != *CHR_SPACE) - { - const char *cp = *map; - - while (i < GRS_MAX_WORD && *cp) - buf[i++] = *(cp++); - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); - else - map = 0; - } - if (!i) - return; - buf[i] = '\0'; - (*p->init)(&wrd); /* set defaults */ - wrd.reg_type = reg_type; - wrd.seqno = seqno++; - wrd.string = buf; - wrd.attrSet = att->parent->ordinal; - wrd.attrUse = att->locals->local; - (*p->add)(&wrd); - } + grs_add_handler (h, recTypeGrs_sgml); + grs_add_handler (h, recTypeGrs_regx); +#if HAVE_TCL_H + grs_add_handler (h, recTypeGrs_tcl); +#endif + grs_add_handler (h, recTypeGrs_marc); + return h; } -static void dumpkeys_complete_field(data1_node *n, struct recExtractCtrl *p, - data1_att *att, int reg_type) +static void grs_destroy(void *clientData) { - const char *b = n->u.data.data; - char buf[GRS_MAX_WORD+1]; - const char **map = 0; - RecWord wrd; - int i = 0, remain; - - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input (p->zebra_maps, reg_type, &b, remain); - - while (remain > 0 && i < GRS_MAX_WORD) + struct grs_handlers *h = (struct grs_handlers *) clientData; + struct grs_handler *gh = h->handlers, *gh_next; + while (gh) { - while (map && *map && **map == *CHR_SPACE) - { - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input(p->zebra_maps, reg_type, &b, remain); - else - map = 0; - } - if (!map) - break; - - if (i && i < GRS_MAX_WORD) - buf[i++] = *CHR_SPACE; - while (map && *map && **map != *CHR_SPACE) - { - const char *cp = *map; - - if (i >= GRS_MAX_WORD) - break; - while (i < GRS_MAX_WORD && *cp) - buf[i++] = *(cp++); - remain = n->u.data.len - (b - n->u.data.data); - if (remain > 0) - map = zebra_maps_input (p->zebra_maps, reg_type, &b, remain); - else - map = 0; - } + gh_next = gh->next; + if (gh->initFlag) + (*gh->type->destroy)(gh->clientData); + free (gh); + gh = gh_next; } - if (!i) - return; - buf[i] = '\0'; - (*p->init)(&wrd); - - wrd.reg_type = reg_type; - wrd.seqno = seqno++; - wrd.string = buf; - wrd.attrSet = att->parent->ordinal; - wrd.attrUse = att->locals->local; - (*p->add)(&wrd); + free (h); } static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) { + RecWord wrd; + (*p->init)(p, &wrd); /* set defaults */ for (; n; n = n->next) { if (p->flagShowRecords) /* display element description to user */ @@ -348,8 +356,9 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) { printf("%*s", level * 4, ""); printf("Data: "); - if (n->u.data.len > 20) - printf("'%.20s...'\n", n->u.data.data); + if (n->u.data.len > 32) + printf("'%.24s ... %.6s'\n", n->u.data.data, + n->u.data.data + n->u.data.len-6); else if (n->u.data.len > 0) printf("'%.*s'\n", n->u.data.len, n->u.data.data); else @@ -382,13 +391,14 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) 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); + { + wrd.reg_type = *tlist->structure; + wrd.string = n->u.data.data; + wrd.length = n->u.data.len; + wrd.attrSet = (int) (tlist->att->parent->reference); + wrd.attrUse = tlist->att->locals->local; + (*p->tokenAdd)(&wrd); + } } } if (p->flagShowRecords && n->which == DATA1N_root) @@ -399,14 +409,29 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level) return 0; } -static int grs_extract(struct recExtractCtrl *p) +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->schemaAdd)(p, oidtmp); + + return dumpkeys(n, p, 0); +} + +static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p, + NMEM mem) { 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; gri.seekf = p->seekf; gri.tellf = p->tellf; @@ -416,17 +441,34 @@ static int grs_extract(struct recExtractCtrl *p) gri.mem = mem; gri.dh = p->dh; - n = read_grs_type (&gri, p->subType); + if (read_grs_type (h, &gri, p->subType, &n)) + return RECCTRL_EXTRACT_ERROR; if (!n) - return -1; + return RECCTRL_EXTRACT_EOF; + oe.proto = PROTO_Z3950; + oe.oclass = CLASS_SCHEMA; + oe.value = n->u.root.absyn->reference; + if ((oid_ent_to_oid (&oe, oidtmp))) + (*p->schemaAdd)(p, oidtmp); + if (dumpkeys(n, p, 0) < 0) { data1_free_tree(p->dh, n); - return -2; + return RECCTRL_EXTRACT_ERROR; } data1_free_tree(p->dh, n); + return RECCTRL_EXTRACT_OK; +} + +static int grs_extract(void *clientData, struct recExtractCtrl *p) +{ + int ret; + NMEM mem = nmem_create (); + struct grs_handlers *h = (struct grs_handlers *) clientData; + + ret = grs_extract_sub(h, p, mem); nmem_destroy(mem); - return 0; + return ret; } /* @@ -440,71 +482,81 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) switch (c->which) { - 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(dh, n->u.root.absyn, - c->u.simple->u.generic))) - { - logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic); - return 25; /* invalid esetname */ - } - logf(LOG_DEBUG, "Esetname '%s' in simple compspec", - c->u.simple->u.generic); - espec = eset->spec; - break; - case Z_RecordComp_complex: - if (c->u.complex->generic) + 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(dh, n->u.root.absyn, + c->u.simple->u.generic))) + { + logf(LOG_LOG, "Unknown esetname '%s'", c->u.simple->u.generic); + return 25; /* invalid esetname */ + } + logf(LOG_DEBUG, "Esetname '%s' in simple compspec", + c->u.simple->u.generic); + espec = eset->spec; + break; + case Z_RecordComp_complex: + if (c->u.complex->generic) + { + /* insert check for schema */ + if ((p = c->u.complex->generic->elementSpec)) { - /* insert check for schema */ - if ((p = c->u.complex->generic->elementSpec)) - switch (p->which) + switch (p->which) + { + case Z_ElementSpec_elementSetName: + if (!(eset = + data1_getesetbyname(dh, n->u.root.absyn, + p->u.elementSetName))) + { + logf(LOG_LOG, "Unknown esetname '%s'", + p->u.elementSetName); + return 25; /* invalid esetname */ + } + logf(LOG_DEBUG, "Esetname '%s' in complex compspec", + p->u.elementSetName); + espec = eset->spec; + break; + case Z_ElementSpec_externalSpec: + if (p->u.externalSpec->which == Z_External_espec1) + { + logf(LOG_DEBUG, "Got Espec-1"); + espec = p->u.externalSpec-> u.espec1; + } + else { - case Z_ElementSpec_elementSetName: - if (!(eset = - data1_getesetbyname(dh, - n->u.root.absyn, - p->u.elementSetName))) - { - logf(LOG_LOG, "Unknown esetname '%s'", - p->u.elementSetName); - return 25; /* invalid esetname */ - } - logf(LOG_DEBUG, "Esetname '%s' in complex compspec", - p->u.elementSetName); - espec = eset->spec; - break; - case Z_ElementSpec_externalSpec: - if (p->u.externalSpec->which == Z_External_espec1) - { - logf(LOG_DEBUG, "Got Espec-1"); - espec = p->u.externalSpec-> u.espec1; - } - else - { - logf(LOG_LOG, "Unknown external espec."); - return 25; /* bad. what is proper diagnostic? */ - } - break; + logf(LOG_LOG, "Unknown external espec."); + return 25; /* bad. what is proper diagnostic? */ } + break; + } } - else - return 26; /* fix */ + } + else + return 26; /* fix */ } if (espec) + { + logf (LOG_DEBUG, "Element: Espec-1 match"); return data1_doespec1(dh, n, espec); + } else + { + logf (LOG_DEBUG, "Element: all match"); return -1; + } } -static int grs_retrieve(struct recRetrieveCtrl *p) +static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) { data1_node *node = 0, *onode = 0; - data1_node *new; + data1_node *dnew; data1_maptab *map; int res, selected = 0; NMEM mem; struct grs_read_info gri; + char *tagname; + struct grs_handlers *h = (struct grs_handlers *) clientData; + int requested_schema = VAL_NONE; mem = nmem_create(); gri.readf = p->readf; @@ -517,93 +569,150 @@ static int grs_retrieve(struct recRetrieveCtrl *p) gri.dh = p->dh; logf (LOG_DEBUG, "grs_retrieve"); - node = read_grs_type (&gri, p->subType); + if (read_grs_type (h, &gri, p->subType, &node)) + { + p->diagnostic = 14; + nmem_destroy (mem); + return 0; + } if (!node) { - p->diagnostic = 2; + p->diagnostic = 14; nmem_destroy (mem); return 0; } - logf (LOG_DEBUG, "grs_retrieve: score"); - if (p->score >= 0 && (new = - data1_insert_taggeddata(p->dh, node, - node, "rank", - mem))) +#if 0 + data1_pr_tree (p->dh, node, stdout); +#endif + logf (LOG_DEBUG, "grs_retrieve: size"); + if ((dnew = data1_insert_taggeddata(p->dh, node, node, + "size", mem))) + { + dnew->u.data.what = DATA1I_text; + dnew->u.data.data = dnew->lbuf; + sprintf(dnew->u.data.data, "%d", p->recordSize); + dnew->u.data.len = strlen(dnew->u.data.data); + } + + tagname = res_get_def(p->res, "tagrank", "rank"); + if (strcmp(tagname, "0") && p->score >= 0 && + (dnew = data1_insert_taggeddata(p->dh, node, 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); + } + + 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))) { - new->u.data.what = DATA1I_num; - new->u.data.data = new->lbuf; - sprintf(new->u.data.data, "%d", p->score); - new->u.data.len = strlen(new->u.data.data); + 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); } - logf (LOG_DEBUG, "grs_retrieve: localControlNumber"); - if ((new = data1_insert_taggeddata(p->dh, node, node, - "localControlNumber", mem))) + + if (p->comp && p->comp->which == Z_RecordComp_complex && + p->comp->u.complex->generic && + p->comp->u.complex->generic->schema) { - new->u.data.what = DATA1I_text; - new->u.data.data = new->lbuf; - sprintf(new->u.data.data, "%d", p->localno); - new->u.data.len = strlen(new->u.data.data); + oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema); + if (oe) + requested_schema = oe->value; + } + + /* If schema has been specified, map if possible, then check that + * we got the right one + */ + if (requested_schema != VAL_NONE) + { + logf (LOG_DEBUG, "grs_retrieve: schema mapping"); + for (map = node->u.root.absyn->maptabs; map; map = map->next) + { + if (map->target_absyn_ref == requested_schema) + { + onode = node; + if (!(node = data1_map_record(p->dh, onode, map, mem))) + { + p->diagnostic = 14; + nmem_destroy (mem); + return 0; + } + break; + } + } + if (node->u.root.absyn && + requested_schema != node->u.root.absyn->reference) + { + p->diagnostic = 238; + nmem_destroy (mem); + return 0; + } + } + /* + * Does the requested format match a known syntax-mapping? (this reflects + * the overlap of schema and formatting which is inherent in the MARC + * family) + */ + logf (LOG_DEBUG, "grs_retrieve: syntax mapping"); + for (map = node->u.root.absyn->maptabs; map; map = map->next) + { + if (map->target_absyn_ref == p->input_format) + { + onode = node; + if (!(node = data1_map_record(p->dh, onode, map, mem))) + { + p->diagnostic = 14; + nmem_destroy (mem); + return 0; + } + break; + } } logf (LOG_DEBUG, "grs_retrieve: schemaIdentifier"); - if (p->input_format == VAL_GRS1 && node->u.root.absyn && - node->u.root.absyn->reference != VAL_NONE) + if (node->u.root.absyn && + node->u.root.absyn->reference != VAL_NONE && + p->input_format == VAL_GRS1) { 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_ent_to_oid (&oe, oidtmp))) { char tmp[128]; data1_handle dh = p->dh; char *p = tmp; int *ii; - + for (ii = oid; *ii >= 0; ii++) { if (p != tmp) - *(p++) = '.'; + *(p++) = '.'; sprintf(p, "%d", *ii); p += strlen(p); } *(p++) = '\0'; - - if ((new = data1_insert_taggeddata(dh, node, node, - "schemaIdentifier", mem))) + + if ((dnew = data1_insert_taggeddata(dh, node, node, + "schemaIdentifier", mem))) { - new->u.data.what = DATA1I_oid; - new->u.data.data = nmem_malloc(mem, p - tmp); - memcpy(new->u.data.data, tmp, p - tmp); - new->u.data.len = p - tmp; + dnew->u.data.what = DATA1I_oid; + dnew->u.data.data = (char *) nmem_malloc(mem, p - tmp); + memcpy(dnew->u.data.data, tmp, p - tmp); + dnew->u.data.len = p - tmp; } } } - logf (LOG_DEBUG, "grs_retrieve: schema mapping"); - /* - * Does the requested format match a known schema-mapping? (this reflects - * the overlap of schema and formatting which is inherent in the MARC - * family) - * NOTE: This should look at the schema-specification in the compspec - * as well. - */ - for (map = node->u.root.absyn->maptabs; map; map = map->next) - if (map->target_absyn_ref == p->input_format) - { - onode = node; - if (!(node = data1_map_record(p->dh, onode, map, mem))) - { - p->diagnostic = 14; - nmem_destroy (mem); - return 0; - } - break; - } - logf (LOG_DEBUG, "grs_retrieve: element spec"); if (p->comp && (res = process_comp(p->dh, node, p->comp)) > 0) { @@ -619,66 +728,90 @@ static int grs_retrieve(struct recRetrieveCtrl *p) logf (LOG_DEBUG, "grs_retrieve: transfer syntax mapping"); switch (p->output_format = (p->input_format != VAL_NONE ? - p->input_format : VAL_SUTRS)) + p->input_format : VAL_SUTRS)) { data1_marctab *marctab; int dummy; - - case VAL_GRS1: - dummy = 0; - 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(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(p->dh, node, selected, - p->odr))) - p->diagnostic = 2; - else - p->rec_len = -1; - break; - case VAL_SUTRS: - if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, - (int*)&p->rec_len))) - { - p->diagnostic = 2; - break; - } + + case VAL_TEXT_XML: + if (!(p->rec_buf = data1_nodetoidsgml(p->dh, node, selected, + &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_GRS1: + dummy = 0; + if (!(p->rec_buf = data1_nodetogr(p->dh, node, selected, + p->odr, &dummy))) + p->diagnostic = 238; /* not available in requested syntax */ + else + p->rec_len = (size_t) (-1); + break; + case VAL_EXPLAIN: + if (!(p->rec_buf = data1_nodetoexplain(p->dh, node, selected, + p->odr))) + p->diagnostic = 238; + else + p->rec_len = (size_t) (-1); + break; + case VAL_SUMMARY: + if (!(p->rec_buf = data1_nodetosummary(p->dh, node, selected, + p->odr))) + p->diagnostic = 238; + else + p->rec_len = (size_t) (-1); + break; + case VAL_SUTRS: + if (!(p->rec_buf = data1_nodetobuf(p->dh, node, selected, + &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, + &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) + { + p->diagnostic = 238; break; - case VAL_SOIF: - if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected, - (int*)&p->rec_len))) - { - p->diagnostic = 2; + } + for (marctab = node->u.root.absyn->marc; marctab; + marctab = marctab->next) + if (marctab->reference == p->input_format) break; - } + if (!marctab) + { + p->diagnostic = 238; break; - default: - for (marctab = node->u.root.absyn->marc; marctab; - marctab = marctab->next) - if (marctab->reference == p->input_format) - break; - if (!marctab) - { - p->diagnostic = 227; - break; - } - if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, - selected, - (int*)&p->rec_len))) - { - p->diagnostic = 2; - break; - } + } + if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, + selected, &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; + } } if (node) data1_free_tree(p->dh, node); @@ -692,6 +825,7 @@ static struct recType grs_type = { "grs", grs_init, + grs_destroy, grs_extract, grs_retrieve };