X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=4ebbe6f39477aa87c06f88909fad87fd2b8b91e3;hb=85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae;hp=46821bcbe9a5d9501f7904fd9feb31cc54ef9ff1;hpb=687f4b034335c161ed1b7b04275857c7fbc69211;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 46821bc..4ebbe6f 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,10 +1,32 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1998, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: recgrs.c,v $ - * Revision 1.13 1997-10-31 12:35:44 adam + * 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 @@ -143,13 +165,10 @@ #include #include -#include #include "grsread.h" #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 { @@ -183,118 +202,10 @@ static void grs_init(void) { } -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; - 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; - - /* 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); - } -} - -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]; - 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) - { - 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; - } - } - 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); -} - 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 +259,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 +294,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->addWord)(&wrd); + } } } if (p->flagShowRecords && n->which == DATA1N_root) @@ -399,12 +312,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; @@ -419,6 +348,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); @@ -492,15 +428,21 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) return 26; /* fix */ } if (espec) + { + logf (LOG_LOG, "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) { data1_node *node = 0, *onode = 0; - data1_node *new; + data1_node *dnew; data1_maptab *map; int res, selected = 0; NMEM mem; @@ -520,30 +462,42 @@ static int grs_retrieve(struct recRetrieveCtrl *p) node = read_grs_type (&gri, p->subType); if (!node) { - p->diagnostic = 2; + p->diagnostic = 14; nmem_destroy (mem); return 0; } + 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); + } + logf (LOG_DEBUG, "grs_retrieve: score"); - if (p->score >= 0 && (new = + if (p->score >= 0 && (dnew = data1_insert_taggeddata(p->dh, node, node, "rank", 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); + 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 ((new = data1_insert_taggeddata(p->dh, node, node, + if ((dnew = data1_insert_taggeddata(p->dh, node, node, "localControlNumber", mem))) { - 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); + 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: schemaIdentifier"); if (p->input_format == VAL_GRS1 && node->u.root.absyn && node->u.root.absyn->reference != VAL_NONE) @@ -572,13 +526,13 @@ static int grs_retrieve(struct recRetrieveCtrl *p) } *(p++) = '\0'; - if ((new = data1_insert_taggeddata(dh, node, node, + 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 = nmem_malloc(mem, p - tmp); + memcpy(dnew->u.data.data, tmp, p - tmp); + dnew->u.data.len = p - tmp; } } } @@ -628,55 +582,54 @@ static int grs_retrieve(struct recRetrieveCtrl *p) dummy = 0; if (!(p->rec_buf = data1_nodetogr(p->dh, node, selected, p->odr, &dummy))) - p->diagnostic = 2; /* this should be better specified */ + p->diagnostic = 238; /* not available in requested syntax */ 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 */ + p->diagnostic = 238; else p->rec_len = -1; break; case VAL_SUMMARY: if (!(p->rec_buf = data1_nodetosummary(p->dh, node, selected, p->odr))) - p->diagnostic = 2; + p->diagnostic = 238; 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; - } + p->diagnostic = 238; break; case VAL_SOIF: if (!(p->rec_buf = data1_nodetosoif(p->dh, node, selected, (int*)&p->rec_len))) - { - p->diagnostic = 2; - break; - } + p->diagnostic = 238; break; default: + if (!node->u.root.absyn) + { + p->diagnostic = 238; + break; + } for (marctab = node->u.root.absyn->marc; marctab; marctab = marctab->next) if (marctab->reference == p->input_format) break; if (!marctab) { - p->diagnostic = 227; + p->diagnostic = 238; break; } if (!(p->rec_buf = data1_nodetomarc(p->dh, marctab, node, selected, (int*)&p->rec_len))) { - p->diagnostic = 2; + p->diagnostic = 238; break; } }