X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Frecgrs.c;h=c024bd41e9759944fea21b6f2ce1ac932506fe27;hb=7c4bb1a2e1e0ed1748e7a443d81af618530f44a6;hp=597488814a7d1111713ca8664146e286b37edb6e;hpb=15ded665c8ca37e3c7a99ce48c2e78acdb727bd6;p=idzebra-moved-to-github.git diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 5974888..c024bd4 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,237 +1,24 @@ -/* - * Copyright (C) 1994-2001, Index Data - * All rights reserved. - * - * $Log: recgrs.c,v $ - * Revision 1.46 2002-04-13 18:16:43 adam - * More XPATH work; common sequence numbers for extract keys - * - * Revision 1.45 2002/04/12 14:40:42 adam - * Work on XPATH - * - * Revision 1.44 2002/04/11 20:09:47 adam - * work on string tag indexing - * - * Revision 1.43 2002/03/21 23:06:36 adam - * Source 'tag' in abs-file - * - * Revision 1.42 2002/02/20 17:30:01 adam - * Work on new API. Locking system re-implemented - * - * Revision 1.41 2001/05/22 21:01:47 adam - * Removed print of data1 tree on stdout so that inetd works again. - * - * Revision 1.40 2001/03/29 21:31:31 adam - * Fixed "record begin" for Tcl filter. - * - * Revision 1.39 2000/12/05 19:09:15 adam - * Fixed problem where indexer could crash if abstract syntax was undefined. - * - * Revision 1.38 2000/12/05 14:44:58 adam - * Fixed minor bug that could cause zmbol to break it data were emitted - * with not parent tags. - * - * Revision 1.37 2000/12/05 12:22:53 adam - * Termlist source implemented (so that we can index values of XML/SGML - * attributes). - * - * 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 - * 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 - * Changed prototype for chr_map_input - added const. - * Added support for C++, headers uses extern "C" for public definitions. - * - * Revision 1.6 1997/09/04 13:54:40 adam - * Added MARC filter - type grs.marc. where syntax refers - * to abstract syntax. New method tellf in retrieve/extract method. - * - * Revision 1.5 1997/07/15 16:29:03 adam - * Initialized dummy variable to keep checker gcc happy. - * - * Revision 1.4 1997/04/30 08:56:08 quinn - * null - * - * Revision 1.2 1996/10/11 16:06:43 quinn - * Revision 1.3 1997/02/24 10:41:50 adam - * Cleanup of code and commented out the "end element-end-record" code. - * - * Revision 1.2 1996/10/11 16:06:43 quinn - * Fixed arguments to nodetogr - * - * Revision 1.1 1996/10/11 10:57:25 adam - * New module recctrl. Used to manage records (extract/retrieval). - * - * Revision 1.29 1996/10/08 10:30:21 quinn - * Fixed type mismatch - * - * Revision 1.28 1996/10/07 16:06:40 quinn - * Added SOIF support - * - * Revision 1.27 1996/06/11 10:54:12 quinn - * Relevance work - * - * Revision 1.26 1996/06/06 12:08:45 quinn - * Added showRecord function - * - * Revision 1.25 1996/06/04 14:18:53 quinn - * Charmap work - * - * Revision 1.24 1996/06/04 13:27:54 quinn - * More work on charmapping - * - * Revision 1.23 1996/06/04 10:19:01 adam - * Minor changes - removed include of ctype.h. - * - * Revision 1.22 1996/06/03 10:15:27 quinn - * Various character-mapping. - * - * Revision 1.21 1996/05/31 13:27:24 quinn - * Character-conversion in phrases, too. - * - * Revision 1.19 1996/05/16 15:31:14 quinn - * a7 - * - * Revision 1.18 1996/05/09 07:28:56 quinn - * Work towards phrases and multiple registers - * - * Revision 1.17 1996/05/01 13:46:37 adam - * First work on multiple records in one file. - * New option, -offset, to the "unread" command in the filter module. - * - * Revision 1.16 1996/01/17 14:57:54 adam - * Prototype changed for reader functions in extract/retrieve. File - * is identified by 'void *' instead of 'int. - * - * Revision 1.15 1996/01/08 19:15:47 adam - * New input filter that works! - * - * Revision 1.14 1995/12/15 12:36:11 adam - * Retrieval calls data1_read_regx when subType is specified. - * - * Revision 1.13 1995/12/15 12:24:43 quinn - * *** empty log message *** - * - * Revision 1.12 1995/12/15 12:20:28 quinn - * *** empty log message *** - * - * Revision 1.11 1995/12/15 12:07:57 quinn - * Changed extraction strategy. - * - * Revision 1.10 1995/12/14 11:10:48 quinn - * Explain work - * - * Revision 1.9 1995/12/13 17:14:05 quinn - * *** empty log message *** - * - * Revision 1.8 1995/12/13 15:33:18 quinn - * *** empty log message *** - * - * Revision 1.7 1995/12/13 13:45:39 quinn - * Changed data1 to use nmem. - * - * Revision 1.6 1995/12/04 14:22:30 adam - * Extra arg to recType_byName. - * Started work on new regular expression parsed input to - * structured records. - * - * Revision 1.5 1995/11/28 14:18:37 quinn - * Set output_format. - * - * Revision 1.4 1995/11/21 13:14:49 quinn - * Fixed end-of-data-field problem (maybe). - * - * Revision 1.3 1995/11/15 19:13:09 adam - * Work on record management. - * - */ +/* $Id: recgrs.c,v 1.74 2003-02-20 21:13:37 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ #include #include @@ -293,7 +80,7 @@ static int read_grs_type (struct grs_handlers *h, static void grs_add_handler (struct grs_handlers *h, RecTypeGrs t) { - struct grs_handler *gh = (struct grs_handler *) malloc (sizeof(*gh)); + struct grs_handler *gh = (struct grs_handler *) xmalloc (sizeof(*gh)); gh->next = h->handlers; h->handlers = gh; gh->initFlag = 0; @@ -303,7 +90,7 @@ static void grs_add_handler (struct grs_handlers *h, RecTypeGrs t) static void *grs_init(RecType recType) { - struct grs_handlers *h = (struct grs_handlers *) malloc (sizeof(*h)); + struct grs_handlers *h = (struct grs_handlers *) xmalloc (sizeof(*h)); h->handlers = 0; grs_add_handler (h, recTypeGrs_sgml); @@ -312,6 +99,12 @@ static void *grs_init(RecType recType) grs_add_handler (h, recTypeGrs_tcl); #endif grs_add_handler (h, recTypeGrs_marc); +#if HAVE_EXPAT_H + grs_add_handler (h, recTypeGrs_xml); +#endif +#if HAVE_PERL + grs_add_handler (h, recTypeGrs_perl); +#endif return h; } @@ -324,12 +117,195 @@ static void grs_destroy(void *clientData) gh_next = gh->next; if (gh->initFlag) (*gh->type->destroy)(gh->clientData); - free (gh); + xfree (gh); gh = gh_next; } - free (h); + xfree (h); +} + +int d1_check_xpath_predicate(data1_node *n, struct xpath_predicate *p) { + int res = 1; + char *attname; + data1_xattr *attr; + + if (!p) { + return (1); + } else { + if (p->which == XPATH_PREDICATE_RELATION) { + if (p->u.relation.name[0]) { + if (*p->u.relation.name != '@') { + logf(LOG_WARN, + " Only attributes (@) are supported in xelm xpath predicates"); + logf(LOG_WARN, "predicate %s ignored", p->u.relation.name); + return (1); + } + attname = p->u.relation.name + 1; + res = 0; + /* looking for the attribute with a specified name */ + for (attr = n->u.tag.attributes; attr; attr = attr->next) { + logf(LOG_DEBUG," - attribute %s <-> %s", attname, attr->name ); + + if (!strcmp(attr->name, attname)) { + if (p->u.relation.op[0]) { + if (*p->u.relation.op != '=') { + logf(LOG_WARN, + "Only '=' relation is supported (%s)",p->u.relation.op); + logf(LOG_WARN, "predicate %s ignored", p->u.relation.name); + res = 1; break; + } else { + logf(LOG_DEBUG," - value %s <-> %s", + p->u.relation.value, attr->value ); + if (!strcmp(attr->value, p->u.relation.value)) { + res = 1; break; + } + } + } else { + /* attribute exists, no value specified */ + res = 1; break; + } + } + } + return (res); + } else { + return (1); + } + } + else if (p->which == XPATH_PREDICATE_BOOLEAN) { + if (!strcmp(p->u.boolean.op,"and")) { + return (d1_check_xpath_predicate(n, p->u.boolean.left) + && d1_check_xpath_predicate(n, p->u.boolean.right)); + } + else if (!strcmp(p->u.boolean.op,"or")) { + return (d1_check_xpath_predicate(n, p->u.boolean.left) + || d1_check_xpath_predicate(n, p->u.boolean.right)); + } else { + logf(LOG_WARN, "Unknown boolean relation %s, ignored",p->u.boolean.op); + return (1); + } + } + } + return 0; +} + + +/* *ostrich* + + New function, looking for xpath "element" definitions in abs, by + tagpath, using a kind of ugly regxp search.The DFA was built while + parsing abs, so here we just go trough them and try to match + against the given tagpath. The first matching entry is returned. + + pop, 2002-12-13 + + Added support for enhanced xelm. Now [] predicates are considered + as well, when selecting indexing rules... (why the hell it's called + termlist???) + + pop, 2003-01-17 + + */ + +data1_termlist *xpath_termlist_by_tagpath(char *tagpath, data1_node *n) +{ + data1_absyn *abs = n->root->u.root.absyn; + data1_xpelement *xpe = abs->xp_elements; + data1_node *nn; +#ifdef ENHANCED_XELM + struct xpath_location_step *xp; + +#endif + char *pexpr = malloc(strlen(tagpath)+2); + int ok = 0; + + sprintf (pexpr, "%s\n", tagpath); + while (xpe) + { + struct DFA_state **dfaar = xpe->dfa->states; + struct DFA_state *s=dfaar[0]; + struct DFA_tran *t; + const char *p; + int i; + unsigned char c; + int start_line = 1; + + c = *pexpr++; t = s->trans; i = s->tran_no; + if (c >= t->ch[0] && c <= t->ch[1]) { + p = pexpr; + do { + if ((s = dfaar[t->to])->rule_no && + (start_line || s->rule_nno)) { + ok = 1; + break; + } + for (t=s->trans, i=s->tran_no; --i >= 0; t++) { + if ((unsigned) *p >= t->ch[0] && (unsigned) *p <= t->ch[1]) + break; + } + p++; + } while (i >= 0); + } + pexpr--; + if (ok) { +#ifdef ENHANCED_XELM + /* we have to check the perdicates up to the root node */ + xp = xpe->xpath; + + /* find the first tag up in the node structure */ + nn = n; while (nn && nn->which != DATA1N_tag) { + nn = nn->parent; + } + + /* go from inside out in the node structure, while going + backwards trough xpath location steps ... */ + for (i=xpe->xpath_len - 1; i>0; i--) { + + logf(LOG_DEBUG,"Checking step %d: %s on tag %s", + i,xp[i].part,nn->u.tag.tag); + + if (!d1_check_xpath_predicate(nn, xp[i].predicate)) { + logf(LOG_DEBUG," Predicates didn't match"); + ok = 0; + break; + } + + if (nn->which == DATA1N_tag) { + nn = nn->parent; + } + } +#endif + if (ok) { + break; + } + } + xpe = xpe->next; + } + + if (ok) { + logf(LOG_DEBUG,"Got it"); + return xpe->termlists; + } else { + return NULL; + } } +/* use + 1 start element (tag) + 2 end element + 3 start attr (and attr-exact) + 4 end attr + + 1016 cdata + 1015 attr data + + *ostrich* + + Now, if there is a matching xelm described in abs, for the + indexed element or the attribute, then the data is handled according + to those definitions... + + modified by pop, 2002-12-13 +*/ + static void index_xpath (data1_node *n, struct recExtractCtrl *p, int level, RecWord *wrd, int use) { @@ -341,27 +317,67 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, switch (n->which) { case DATA1N_data: - wrd->reg_type = 'w'; wrd->string = n->u.data.data; wrd->length = n->u.data.len; - wrd->attrSet = VAL_IDXPATH, - wrd->attrUse = use; if (p->flagShowRecords) { printf("%*s data=", (level + 1) * 4, ""); for (i = 0; ilength && i < 8; i++) fputc (wrd->string[i], stdout); printf("\n"); - } - else - { - (*p->tokenAdd)(wrd); + } + else { + data1_termlist *tl; + int xpdone = 0; + flen = 0; + + /* we have to fetch the whole path to the data tag */ + for (nn = n; nn; nn = nn->parent) { + if (nn->which == DATA1N_tag) { + size_t tlen = strlen(nn->u.tag.tag); + if (tlen + flen > (sizeof(tag_path_full)-2)) return; + memcpy (tag_path_full + flen, nn->u.tag.tag, tlen); + flen += tlen; + tag_path_full[flen++] = '/'; + } + else if (nn->which == DATA1N_root) break; + } + + tag_path_full[flen] = 0; + + /* If we have a matching termlist... */ + if ((tl = xpath_termlist_by_tagpath(tag_path_full, n))) { + for (; tl; tl = tl->next) { + wrd->reg_type = *tl->structure; + /* this is the ! case, so structure is for the xpath index */ + if (!tl->att) { + wrd->attrSet = VAL_IDXPATH; + wrd->attrUse = use; + (*p->tokenAdd)(wrd); + xpdone = 1; + /* this is just the old fashioned attribute based index */ + } else { + wrd->attrSet = (int) (tl->att->parent->reference); + wrd->attrUse = tl->att->locals->local; + (*p->tokenAdd)(wrd); + } + } + } + /* xpath indexing is done, if there was no termlist given, + or no ! attribute... */ + if (!xpdone) { + wrd->attrSet = VAL_IDXPATH; + wrd->attrUse = use; + wrd->reg_type = 'w'; + (*p->tokenAdd)(wrd); + } } break; case DATA1N_tag: + flen = 0; for (nn = n; nn; nn = nn->parent) { - if (n->which == DATA1N_tag) + if (nn->which == DATA1N_tag) { size_t tlen = strlen(nn->u.tag.tag); if (tlen + flen > (sizeof(tag_path_full)-2)) @@ -370,21 +386,15 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, flen += tlen; tag_path_full[flen++] = '/'; } - else if (n->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++] = '/'; + else if (nn->which == DATA1N_root) 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) { @@ -397,9 +407,96 @@ static void index_xpath (data1_node *n, struct recExtractCtrl *p, } else { - (*p->tokenAdd)(wrd); + data1_xattr *xp; + (*p->tokenAdd)(wrd); /* index element pag (AKA tag path) */ + if (use == 1) + { + for (xp = n->u.tag.attributes; xp; xp = xp->next) + { + char comb[512]; + /* attribute (no value) */ + wrd->reg_type = '0'; + wrd->attrUse = 3; + wrd->string = xp->name; + wrd->length = strlen(xp->name); + + wrd->seqno--; + (*p->tokenAdd)(wrd); + + if (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); + } + } + for (xp = n->u.tag.attributes; xp; xp = xp->next) + { + char attr_tag_path_full[1024]; + int int_len = flen; + + sprintf (attr_tag_path_full, "@%s/%.*s", + xp->name, int_len, tag_path_full); + wrd->reg_type = '0'; + wrd->attrUse = 1; + wrd->string = attr_tag_path_full; + wrd->length = strlen(attr_tag_path_full); + (*p->tokenAdd)(wrd); + + if (xp->value) + { + /* the same jokes, as with the data nodes ... */ + data1_termlist *tl; + int xpdone = 0; + + wrd->string = xp->value; + wrd->length = strlen(xp->value); + wrd->reg_type = 'w'; + + if ((tl = xpath_termlist_by_tagpath(attr_tag_path_full, + n))) { + for (; tl; tl = tl->next) { + wrd->reg_type = *tl->structure; + if (!tl->att) { + wrd->attrSet = VAL_IDXPATH; + wrd->attrUse = 1015; + (*p->tokenAdd)(wrd); + xpdone = 1; + } else { + wrd->attrSet = (int) (tl->att->parent->reference); + wrd->attrUse = tl->att->locals->local; + (*p->tokenAdd)(wrd); + } + } + + } + if (!xpdone) { + wrd->attrSet = VAL_IDXPATH; + wrd->attrUse = 1015; + wrd->reg_type = 'w'; + (*p->tokenAdd)(wrd); + } + } + + wrd->attrSet = VAL_IDXPATH; + wrd->reg_type = '0'; + wrd->attrUse = 2; + wrd->string = attr_tag_path_full; + wrd->length = strlen(attr_tag_path_full); + (*p->tokenAdd)(wrd); + } + } } - break; } } @@ -408,6 +505,7 @@ static void index_termlist (data1_node *par, data1_node *n, { data1_termlist *tlist = 0; data1_datatype dtype = DATA1K_string; + /* * cycle up towards the root until we find a tag with an att.. * this has the effect of indexing locally defined tags with @@ -415,19 +513,20 @@ static void index_termlist (data1_node *par, data1_node *n, */ while (!par->u.tag.element) - if (!par->parent || !(par=get_parent_tag(p->dh, par->parent))) - break; + if (!par->parent || !(par=get_parent_tag(p->dh, par->parent))) + break; if (!par || !(tlist = par->u.tag.element->termlists)) - return; + return; if (par->u.tag.element->tag) - dtype = par->u.tag.element->tag->kind; + dtype = par->u.tag.element->tag->kind; for (; tlist; tlist = tlist->next) { + char xattr[512]; /* consider source */ wrd->string = 0; - + if (!strcmp (tlist->source, "data") && n->which == DATA1N_data) { wrd->string = n->u.data.data; @@ -526,8 +625,12 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level, { index_termlist (n, n, p, level, wrd); /* index start tag */ + assert (n->root->u.root.absyn); + if (!n->root->u.root.absyn) index_xpath (n, p, level, wrd, 1); + else if (n->root->u.root.absyn->enable_xpath_indexing) + index_xpath (n, p, level, wrd, 1); } if (n->child) @@ -543,8 +646,8 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level, { printf("%*s", level * 4, ""); printf("Data: "); - if (n->u.data.len > 32) - printf("'%.24s ... %.6s'\n", n->u.data.data, + if (n->u.data.len > 256) + printf("'%.240s ... %.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); @@ -556,7 +659,8 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level, index_termlist (par, n, p, level, wrd); if (!n->root->u.root.absyn) index_xpath (n, p, level, wrd, 1016); - + else if (n->root->u.root.absyn->enable_xpath_indexing) + index_xpath (n, p, level, wrd, 1016); } if (n->which == DATA1N_tag) @@ -564,9 +668,10 @@ static int dumpkeys(data1_node *n, struct recExtractCtrl *p, int level, /* index end tag */ if (!n->root->u.root.absyn) index_xpath (n, p, level, wrd, 2); + else if (n->root->u.root.absyn->enable_xpath_indexing) + index_xpath (n, p, level, wrd, 2); } - if (p->flagShowRecords && n->which == DATA1N_root) { printf("%*s-------------\n\n", level * 4, ""); @@ -591,6 +696,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); } @@ -613,7 +719,7 @@ static int grs_extract_sub(struct grs_handlers *h, struct recExtractCtrl *p, gri.dh = p->dh; if (read_grs_type (h, &gri, p->subType, &n)) - return RECCTRL_EXTRACT_ERROR; + return RECCTRL_EXTRACT_ERROR_NO_SUCH_FILTER; if (!n) return RECCTRL_EXTRACT_EOF; oe.proto = PROTO_Z3950; @@ -628,14 +734,19 @@ 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) { data1_free_tree(p->dh, n); - return RECCTRL_EXTRACT_ERROR; + return RECCTRL_EXTRACT_ERROR_GENERIC; } data1_free_tree(p->dh, n); return RECCTRL_EXTRACT_OK; @@ -727,17 +838,67 @@ static int process_comp(data1_handle dh, data1_node *n, Z_RecordComposition *c) } } +/* Add Zebra info in separate namespace ... + + 359 + 447 + records/genera.xml + + +*/ + +static void zebra_xml_metadata (struct recRetrieveCtrl *p, data1_node *top, + NMEM mem) +{ + const char *idzebra_ns[3]; + const char *i2 = "\n "; + const char *i4 = "\n "; + data1_node *n; + + idzebra_ns[0] = "xmlns"; + idzebra_ns[1] = "http://www.indexdata.dk/zebra/"; + idzebra_ns[2] = 0; + + data1_mk_text (p->dh, mem, i2, top); + + n = data1_mk_tag (p->dh, mem, "idzebra", idzebra_ns, top); + + data1_mk_text (p->dh, mem, "\n", top); + + data1_mk_text (p->dh, mem, i4, n); + + data1_mk_tag_data_int (p->dh, n, "size", p->recordSize, mem); + + if (p->score != -1) + { + data1_mk_text (p->dh, mem, i4, n); + data1_mk_tag_data_int (p->dh, n, "score", p->score, mem); + } + data1_mk_text (p->dh, mem, i4, n); + data1_mk_tag_data_int (p->dh, n, "localnumber", p->localno, mem); + if (p->fname) + { + data1_mk_text (p->dh, mem, i4, n); + data1_mk_tag_data_text(p->dh, n, "filename", p->fname, mem); + } + data1_mk_text (p->dh, mem, i2, n); +} + 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; NMEM mem; struct grs_read_info gri; - char *tagname; + const char *tagname; struct grs_handlers *h = (struct grs_handlers *) clientData; int requested_schema = VAL_NONE; + data1_marctab *marctab; + int dummy; mem = nmem_create(); gri.readf = p->readf; @@ -762,22 +923,28 @@ 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_insert_taggeddata(p->dh, node, node, - "size", mem))) + tagname = data1_systag_lookup(node->u.root.absyn, "size", "size"); + if (tagname && + (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, 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))) + + tagname = data1_systag_lookup(node->u.root.absyn, "rank", "rank"); + if (tagname && p->score >= 0 && + (dnew = data1_mk_tag_data_wd(p->dh, top, tagname, mem))) { logf (LOG_DEBUG, "grs_retrieve: %s", tagname); dnew->u.data.what = DATA1I_num; @@ -786,25 +953,40 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) 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))) + tagname = data1_systag_lookup(node->u.root.absyn, "sysno", + "localControlNumber"); + if (tagname && p->localno > 0 && + (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); } - +#if 0 + data1_pr_tree (p->dh, node, stdout); +#endif +#if YAZ_VERSIONL >= 0x010903L if (p->comp && p->comp->which == Z_RecordComp_complex && p->comp->u.complex->generic && - p->comp->u.complex->generic->schema) + p->comp->u.complex->generic->which == Z_Schema_oid && + p->comp->u.complex->generic->schema.oid) + { + oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema.oid); + if (oe) + requested_schema = oe->value; + } +#else + if (p->comp && p->comp->which == Z_RecordComp_complex && + p->comp->u.complex->generic && p->comp->u.complex->generic->schema) { oident *oe = oid_getentbyoid (p->comp->u.complex->generic->schema); if (oe) requested_schema = oe->value; } +#endif /* If schema has been specified, map if possible, then check that * we got the right one @@ -839,7 +1021,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) * the overlap of schema and formatting which is inherent in the MARC * family) */ - logf (LOG_DEBUG, "grs_retrieve: syntax mapping"); + yaz_log (LOG_DEBUG, "grs_retrieve: syntax mapping"); if (node->u.root.absyn) for (map = node->u.root.absyn->maptabs; map; map = map->next) { @@ -855,7 +1037,7 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) break; } } - logf (LOG_DEBUG, "grs_retrieve: schemaIdentifier"); + yaz_log (LOG_DEBUG, "grs_retrieve: schemaIdentifier"); if (node->u.root.absyn && node->u.root.absyn->reference != VAL_NONE && p->input_format == VAL_GRS1) @@ -882,10 +1064,8 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) sprintf(p, "%d", *ii); p += strlen(p); } - *(p++) = '\0'; - - if ((dnew = data1_insert_taggeddata(dh, node, node, - "schemaIdentifier", mem))) + if ((dnew = data1_mk_tag_data_wd(dh, top, + "schemaIdentifier", mem))) { dnew->u.data.what = DATA1I_oid; dnew->u.data.data = (char *) nmem_malloc(mem, p - tmp); @@ -915,10 +1095,16 @@ static int grs_retrieve(void *clientData, struct recRetrieveCtrl *p) switch (p->output_format = (p->input_format != VAL_NONE ? p->input_format : VAL_SUTRS)) { - data1_marctab *marctab; - int dummy; - case VAL_TEXT_XML: + zebra_xml_metadata (p, top, mem); + +#if 0 + data1_pr_tree (p->dh, node, stdout); +#endif + + 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; @@ -952,6 +1138,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; @@ -988,6 +1176,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;