X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_doespec.c;h=62a4d1d941a5a99de7c2a5806131d6e612d0be59;hp=1c361f001ba414337f827c8a6047b973bccad846;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=e6a55188366477082cb2446e7065d0f624dabcfb diff --git a/retrieval/d1_doespec.c b/retrieval/d1_doespec.c index 1c361f0..62a4d1d 100644 --- a/retrieval/d1_doespec.c +++ b/retrieval/d1_doespec.c @@ -1,10 +1,31 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_doespec.c,v $ - * Revision 1.6 1996-10-11 11:57:22 quinn + * Revision 1.13 1999-08-27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.12 1999/04/23 13:34:33 adam + * Fixed bug in match_triple. Thanks to Franck Falcoz . + * + * Revision 1.11 1997/11/06 11:36:44 adam + * Implemented variant match on simple elements -data1 tree and Espec-1. + * + * Revision 1.10 1997/10/02 12:10:24 quinn + * Attempt to fix bug in especs + * + * Revision 1.9 1997/09/17 12:10:35 adam + * YAZ version 1.4. + * + * Revision 1.8 1997/05/14 06:54:02 adam + * C++ support. + * + * Revision 1.7 1997/04/30 08:52:11 quinn + * Null + * + * Revision 1.6 1996/10/11 11:57:22 quinn * Smallish * * Revision 1.5 1996/07/06 19:58:34 quinn @@ -32,12 +53,16 @@ #include #include -static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, +static int match_children(data1_handle dh, data1_node *n, + Z_Espec1 *e, int i, Z_ETagUnit **t, int num); -static int match_children_wildpath(data1_node *n, Z_Espec1 *e, int i, - Z_ETagUnit **t, int num) -{return 0;} +static int match_children_wildpath(data1_handle dh, data1_node *n, + Z_Espec1 *e, int i, + Z_ETagUnit **t, int num) +{ + return 0; +} /* * Locate a specific triple within a variant. @@ -45,7 +70,7 @@ static int match_children_wildpath(data1_node *n, Z_Espec1 *e, int i, * triple with an unknown set. */ static Z_Triple *find_triple(Z_Variant *var, oid_value universalset, - oid_value set, int class, int type) + oid_value set, int zclass, int type) { int i; oident *defaultsetent = oid_getentbyoid(var->globalVariantSetId); @@ -59,7 +84,7 @@ static Z_Triple *find_triple(Z_Variant *var, oid_value universalset, oid_value curset = cursetent ? cursetent->value : defaultset; if (set == curset && - *var->triples[i]->class == class && + *var->triples[i]->zclass == zclass && *var->triples[i]->type == type) return var->triples[i]; } @@ -71,7 +96,17 @@ static void mark_subtree(data1_node *n, int make_variantlist, int no_data, { data1_node *c; +#if 1 + if (n->which == DATA1N_tag) +#else if (n->which == DATA1N_tag && (!n->child || n->child->which != DATA1N_tag)) + /* + * This seems to cause multi-level elements to fall out when only a + * top-level elementRequest has been given... Problem is, I can't figure + * out what it was supposed to ACHIEVE.... delete when code has been + * verified. + */ +#endif { n->u.tag.node_selected = 1; n->u.tag.make_variantlist = make_variantlist; @@ -93,8 +128,53 @@ static void mark_subtree(data1_node *n, int make_variantlist, int no_data, } } -static int match_children_here(data1_node *n, Z_Espec1 *e, int i, - Z_ETagUnit **t, int num) + +static void match_triple (data1_handle dh, Z_Variant *vreq, + oid_value defsetval, + oid_value var1, data1_node *n) +{ + data1_node **c; + + if (!(n = n->child)) + return; + if (n->which != DATA1N_variant) + return; + c = &n->child; + while (*c) + { + int remove_flag = 0; + Z_Triple *r; + + assert ((*c)->which == DATA1N_variant); + + if ((*c)->u.variant.type->zclass->zclass == 4 && + (*c)->u.variant.type->type == 1) + { + if ((r = find_triple(vreq, defsetval, var1, 4, 1)) && + (r->which == Z_Triple_internationalString)) + { + const char *string_value = + r->value.internationalString; + if (strcmp ((*c)->u.variant.value, string_value)) + remove_flag = 1; + } + } + if (remove_flag) + { + data1_free_tree (dh, *c); + *c = (*c)->next; + } + else + { + match_triple (dh, vreq, defsetval, var1, *c); + c = &(*c)->next; + } + } +} + +static int match_children_here (data1_handle dh, data1_node *n, + Z_Espec1 *e, int i, + Z_ETagUnit **t, int num) { int counter = 0, hits = 0; data1_node *c; @@ -104,7 +184,6 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i, for (c = n->child; c ; c = c->next) { data1_tag *tag = 0; - if (c->which != DATA1N_tag) return 0; @@ -143,14 +222,14 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i, counter++; if (occur && occur->which == Z_Occurrences_last) { - logf(LOG_WARN, "Can't do occurrences=last (yet)"); + yaz_log(LOG_WARN, "Can't do occurrences=last (yet)"); return 0; } if (!occur || occur->which == Z_Occurrences_all || (occur->which == Z_Occurrences_values && counter >= *occur->u.values->start)) { - if (match_children(c, e, i, t + 1, num - 1)) + if (match_children(dh, c, e, i, t + 1, num - 1)) { c->u.tag.node_selected = 1; /* @@ -191,6 +270,9 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i, if ((r = find_triple(vreq, defsetval, var1, 5, 5))) if (r->which == Z_Triple_integer) get_bytes = *r->value.integer; + + if (!show_variantlist) + match_triple (dh, vreq, defsetval, var1, c); } mark_subtree(c, show_variantlist, no_data, get_bytes, vreq); } @@ -209,8 +291,8 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i, return hits; } -static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, - int num) +static int match_children(data1_handle dh, data1_node *n, Z_Espec1 *e, + int i, Z_ETagUnit **t, int num) { int res; @@ -219,17 +301,17 @@ static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, switch (t[0]->which) { case Z_ETagUnit_wildThing: - case Z_ETagUnit_specificTag: res = match_children_here(n, e, i, - t, num); break; - case Z_ETagUnit_wildPath: res = match_children_wildpath(n, e, i, - t, num); break; + case Z_ETagUnit_specificTag: + res = match_children_here(dh, n, e, i, t, num); break; + case Z_ETagUnit_wildPath: + res = match_children_wildpath(dh, n, e, i, t, num); break; default: abort(); } return res; } -int data1_doespec1(data1_node *n, Z_Espec1 *e) +int data1_doespec1 (data1_handle dh, data1_node *n, Z_Espec1 *e) { int i; @@ -237,8 +319,9 @@ int data1_doespec1(data1_node *n, Z_Espec1 *e) { if (e->elements[i]->which != Z_ERequest_simpleElement) return 100; - match_children(n, e, i, e->elements[i]->u.simpleElement->path->tags, - e->elements[i]->u.simpleElement->path->num_tags); + match_children(dh, n, e, i, + e->elements[i]->u.simpleElement->path->tags, + e->elements[i]->u.simpleElement->path->num_tags); } return 0; }