X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=retrieval%2Fd1_doespec.c;h=19c3abafab399342ec15ca5f3cf2ab94b356c64f;hb=5b690aebb8dc2d05cad8f668de8fd821a1c231fa;hp=36270720961cc8fdfce718e0865eeca3e796c182;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git diff --git a/retrieval/d1_doespec.c b/retrieval/d1_doespec.c index 3627072..19c3aba 100644 --- a/retrieval/d1_doespec.c +++ b/retrieval/d1_doespec.c @@ -1,52 +1,28 @@ /* - * Copyright (c) 1995, Index Data. + * Copyright (c) 1995-2002, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: d1_doespec.c,v $ - * 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 - * System headerfiles gathered in yconfig - * - * Revision 1.4 1996/06/07 11:04:32 quinn - * Fixed tag->tagset dependency - * - * Revision 1.3 1995/11/13 09:27:33 quinn - * Fiddling with the variant stuff. - * - * Revision 1.2 1995/11/01 13:54:45 quinn - * Minor adjustments - * - * Revision 1.1 1995/11/01 11:56:07 quinn - * Added Retrieval (data management) functions en masse. - * - * + * $Id: d1_doespec.c,v 1.15 2002-09-24 13:58:13 adam Exp $ */ - #include -#include -#include -#include -#include -static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, +#include +#include +#include +#include + +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. @@ -80,7 +56,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; @@ -102,8 +88,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; @@ -115,7 +146,7 @@ static int match_children_here(data1_node *n, Z_Espec1 *e, int i, data1_tag *tag = 0; if (c->which != DATA1N_tag) - return 0; + continue; if (tp->which == Z_ETagUnit_specificTag) { @@ -152,14 +183,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; /* @@ -200,6 +231,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); } @@ -218,8 +252,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; @@ -227,13 +261,13 @@ static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, return 1; 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; - default: - abort(); + case Z_ETagUnit_wildThing: + 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; } @@ -242,12 +276,17 @@ int data1_doespec1 (data1_handle dh, data1_node *n, Z_Espec1 *e) { int i; + n = data1_get_root_tag (dh, n); + if (n && n->which == DATA1N_tag) + n->u.tag.node_selected = 1; + for (i = 0; i < e->num_elements; i++) { - 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); + if (e->elements[i]->which != Z_ERequest_simpleElement) + return 100; + match_children(dh, n, e, i, + e->elements[i]->u.simpleElement->path->tags, + e->elements[i]->u.simpleElement->path->num_tags); } return 0; }