X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=retrieval%2Fd1_doespec.c;h=5914a678db5dc9b0fed4414c73a740e6fba5690f;hp=bc16d0795763ada5976719b6d255aed42cf85842;hb=85a2e7affad79fd8bd59b403ba7b5f7867d60523;hpb=cea212fba995de3fa0d6d6723d828f6fd7ca31df diff --git a/retrieval/d1_doespec.c b/retrieval/d1_doespec.c index bc16d07..5914a67 100644 --- a/retrieval/d1_doespec.c +++ b/retrieval/d1_doespec.c @@ -4,7 +4,25 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: d1_doespec.c,v $ - * Revision 1.1 1995-11-01 11:56:07 quinn + * 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. * * @@ -12,16 +30,74 @@ #include +#include #include #include -#include "data1.h" +#include -static int match_children(data1_node *n, Z_ETagUnit **t, int num); +static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, + int num); -static int match_children_wildpath(data1_node *n, 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_here(data1_node *n, Z_ETagUnit **t, int num) +/* + * Locate a specific triple within a variant. + * set is the set to look for, universal set is the set that applies to a + * triple with an unknown set. + */ +static Z_Triple *find_triple(Z_Variant *var, oid_value universalset, + oid_value set, int class, int type) +{ + int i; + oident *defaultsetent = oid_getentbyoid(var->globalVariantSetId); + oid_value defaultset = defaultsetent ? defaultsetent->value : + universalset; + + for (i = 0; i < var->num_triples; i++) + { + oident *cursetent = + oid_getentbyoid(var->triples[i]->variantSetId); + oid_value curset = cursetent ? cursetent->value : defaultset; + + if (set == curset && + *var->triples[i]->class == class && + *var->triples[i]->type == type) + return var->triples[i]; + } + return 0; +} + +static void mark_subtree(data1_node *n, int make_variantlist, int no_data, + int get_bytes, Z_Variant *vreq) +{ + data1_node *c; + + if (n->which == DATA1N_tag && (!n->child || n->child->which != DATA1N_tag)) + { + n->u.tag.node_selected = 1; + n->u.tag.make_variantlist = make_variantlist; + n->u.tag.no_data_requested = no_data; + n->u.tag.get_bytes = get_bytes; + } + + for (c = n->child; c; c = c->next) + { + if (c->which == DATA1N_tag && (!n->child || + n->child->which != DATA1N_tag)) + { + c->u.tag.node_selected = 1; + c->u.tag.make_variantlist = make_variantlist; + c->u.tag.no_data_requested = no_data; + c->u.tag.get_bytes = get_bytes; + } + mark_subtree(c, make_variantlist, no_data, get_bytes, vreq); + } +} + +static int match_children_here(data1_node *n, Z_Espec1 *e, int i, + Z_ETagUnit **t, int num) { int counter = 0, hits = 0; data1_node *c; @@ -41,7 +117,8 @@ static int match_children_here(data1_node *n, Z_ETagUnit **t, int num) occur = want->occurrences; if (c->u.tag.element) tag = c->u.tag.element->tag; - if (*want->tagType != (tag ? tag->tagset->type : 3)) + if (*want->tagType != ((tag && tag->tagset) ? tag->tagset->type : + 3)) continue; if (want->tagValue->which == Z_StringOrNumeric_numeric) { @@ -76,16 +153,58 @@ static int match_children_here(data1_node *n, Z_ETagUnit **t, int num) (occur->which == Z_Occurrences_values && counter >= *occur->u.values->start)) { - if (match_children(c, t + 1, num - 1)) + if (match_children(c, e, i, t + 1, num - 1)) { c->u.tag.node_selected = 1; + /* + * Consider the variant specification if this is a complete + * match. + */ + if (num == 1) + { + int show_variantlist = 0; + int no_data = 0; + int get_bytes = -1; + + Z_Variant *vreq = + e->elements[i]->u.simpleElement->variantRequest; + oident *defset = oid_getentbyoid(e->defaultVariantSetId); + oid_value defsetval = defset ? defset->value : VAL_NONE; + oid_value var1 = oid_getvalbyname("Variant-1"); + + if (!vreq) + vreq = e->defaultVariantRequest; + + if (vreq) + { + Z_Triple *r; + + /* + * 6,5: meta-data requested, variant list. + */ + if (find_triple(vreq, defsetval, var1, 6, 5)) + show_variantlist = 1; + /* + * 9,1: Miscellaneous, no data requested. + */ + if (find_triple(vreq, defsetval, var1, 9, 1)) + no_data = 1; + + /* howmuch */ + if ((r = find_triple(vreq, defsetval, var1, 5, 5))) + if (r->which == Z_Triple_integer) + get_bytes = *r->value.integer; + } + mark_subtree(c, show_variantlist, no_data, get_bytes, vreq); + } hits++; /* * have we looked at enough children? */ if (!occur || (occur->which == Z_Occurrences_values && + (!occur->u.values->howMany || counter - *occur->u.values->start >= - *occur->u.values->howMany - 1)) + *occur->u.values->howMany - 1))) return hits; } } @@ -93,34 +212,24 @@ static int match_children_here(data1_node *n, Z_ETagUnit **t, int num) return hits; } -static void mark_children(data1_node *n) +static int match_children(data1_node *n, Z_Espec1 *e, int i, Z_ETagUnit **t, + int num) { - data1_node *c; - - for (c = n->child; c; c = c->next) - { - if (c->which != DATA1N_tag) - continue; - c->u.tag.node_selected = 1; - mark_children(c); - } -} + int res; -static int match_children(data1_node *n, Z_ETagUnit **t, int num) -{ if (!num) - { - mark_children(n); /* Here there shall be variants, like, dude */ return 1; - } switch (t[0]->which) { case Z_ETagUnit_wildThing: - case Z_ETagUnit_specificTag: return match_children_here(n, t, num); - case Z_ETagUnit_wildPath: return match_children_wildpath(n, t, num); + 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(); } + return res; } int data1_doespec1(data1_node *n, Z_Espec1 *e) @@ -128,7 +237,11 @@ int data1_doespec1(data1_node *n, Z_Espec1 *e) int i; for (i = 0; i < e->num_elements; i++) - match_children(n, e->elements[i]->u.simpleElement->path->tags, + { + 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); + } return 0; }