-/* $Id: d1_doespec.c,v 1.2 2002-10-22 13:19:50 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2010 Index Data
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
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.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
+/** \file d1_doespec.c
+ * \brief handle Z39.50 variant-1 specs
+ *
+ * See http://www.loc.gov/z3950/agency/defns/variant1.html
+ */
#include <assert.h>
+#include <stdlib.h>
-#include <yaz/oid.h>
#include <yaz/log.h>
#include <yaz/proto.h>
-#include <data1.h>
+#include <yaz/oid_db.h>
+#include <idzebra/data1.h>
static int match_children(data1_handle dh, data1_node *n,
Z_Espec1 *e, int i, Z_ETagUnit **t,
- int num);
+ int num,
+ int select_flag);
static int match_children_wildpath(data1_handle dh, data1_node *n,
Z_Espec1 *e, int i,
* 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 zclass, int type)
+static Z_Triple *find_triple(Z_Variant *var, const Odr_oid *universal_oid,
+ const Odr_oid *var_oid, int zclass, 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]->zclass == zclass &&
- *var->triples[i]->type == type)
+ const Odr_oid *cur_oid = var->triples[i]->variantSetId;
+ if (!cur_oid)
+ cur_oid = var->globalVariantSetId;
+ if (cur_oid && var_oid
+ && !oid_oidcmp(var_oid, cur_oid) && *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)
+ int get_bytes, Z_Variant *vreq, int select_flag)
{
data1_node *c;
*/
#endif
{
- n->u.tag.node_selected = 1;
+ n->u.tag.node_selected = select_flag;
n->u.tag.make_variantlist = make_variantlist;
n->u.tag.no_data_requested = no_data;
n->u.tag.get_bytes = get_bytes;
if (c->which == DATA1N_tag && (!n->child ||
n->child->which != DATA1N_tag))
{
- c->u.tag.node_selected = 1;
+ c->u.tag.node_selected = select_flag;
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);
+ mark_subtree(c, make_variantlist, no_data, get_bytes, vreq,
+ select_flag);
}
}
-static void match_triple (data1_handle dh, Z_Variant *vreq,
- oid_value defsetval,
- oid_value var1, data1_node *n)
+static void match_triple(data1_handle dh, Z_Variant *vreq,
+ const Odr_oid *def_oid,
+ const Odr_oid *var_oid, data1_node *n)
{
data1_node **c;
if ((*c)->u.variant.type->zclass->zclass == 4 &&
(*c)->u.variant.type->type == 1)
{
- if ((r = find_triple(vreq, defsetval, var1, 4, 1)) &&
+ if ((r = find_triple(vreq, def_oid, var_oid, 4, 1)) &&
(r->which == Z_Triple_internationalString))
{
const char *string_value =
}
if (remove_flag)
{
- data1_free_tree (dh, *c);
*c = (*c)->next;
}
else
{
- match_triple (dh, vreq, defsetval, var1, *c);
+ match_triple(dh, vreq, def_oid, var_oid, *c);
c = &(*c)->next;
}
}
}
+
+static int match_node_and_attr (data1_node *c, const char *spec)
+{
+
+ char predicate[64];
+ char elem[64];
+ char attr[64];
+ char value[64];
+ char dummy_ch;
+
+ data1_tag *tag = 0;
+ if (c->u.tag.element)
+ tag = c->u.tag.element->tag;
+
+ *predicate = '\0';
+ sscanf(spec, "%63[^[]%c%63[^]]", elem, &dummy_ch, predicate);
+ if (data1_matchstr(elem, tag ? tag->value.string : c->u.tag.tag))
+ return 0;
+
+ if (*predicate == '\0')
+ return 1;
+ else if (sscanf(predicate, "@%63[^=]=%63s", attr, value) == 2)
+ {
+ data1_xattr *xa;
+ for (xa = c->u.tag.attributes; xa; xa = xa->next)
+ if (!strcmp(xa->name, attr) &&
+ !strcmp(xa->value, value))
+ return 1;
+ return 0;
+ }
+ else if (sscanf(predicate, "@%63s", attr) == 1)
+ {
+ data1_xattr *xa;
+ for (xa = c->u.tag.attributes; xa; xa = xa->next)
+ if (!strcmp(xa->name, attr))
+ return 1;
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Bad simpleelement component: '%s'", spec);
+ }
+ return 0;
+}
static int match_children_here (data1_handle dh, data1_node *n,
Z_Espec1 *e, int i,
- Z_ETagUnit **t, int num)
+ Z_ETagUnit **t, int num,
+ int select_flag)
{
int counter = 0, hits = 0;
data1_node *c;
if (*want->tagValue->u.numeric != tag->value.numeric)
continue;
}
- else
+ else if (want->tagValue->which == Z_StringOrNumeric_string)
{
- assert(want->tagValue->which == Z_StringOrNumeric_string);
+ const char *str_val = want->tagValue->u.string;
+ if (str_val[0] == '!')
+ {
+ str_val++;
+ select_flag = 0;
+ }
if (tag && tag->which != DATA1T_string)
continue;
- if (data1_matchstr(want->tagValue->u.string,
- tag ? tag->value.string : c->u.tag.tag))
+#if 1
+ if (!match_node_and_attr(c, str_val))
continue;
+#else
+ if (data1_matchstr(str_val,
+ tag ? tag->value.string : c->u.tag.tag))
+ continue;
+#endif
+ }
+ else
+ {
+ yaz_log(YLOG_WARN, "Bad SpecificTag type: %d",
+ want->tagValue->which);
+ continue;
}
}
- else
+ else if (tp->which == Z_ETagUnit_wildThing)
occur = tp->u.wildThing;
-
+ else
+ continue;
/*
* Ok, so we have a matching tag. Are we within occurrences-range?
*/
counter++;
if (occur && occur->which == Z_Occurrences_last)
{
- yaz_log(LOG_WARN, "Can't do occurrences=last (yet)");
+ yaz_log(YLOG_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(dh, c, e, i, t + 1, num - 1))
+ if (match_children(dh, c, e, i, t + 1, num - 1, select_flag))
{
- c->u.tag.node_selected = 1;
+ c->u.tag.node_selected = select_flag;
/*
* Consider the variant specification if this is a complete
* match.
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");
+ const Odr_oid *var_oid = yaz_oid_varset_variant_1;
if (!vreq)
vreq = e->defaultVariantRequest;
/*
* 6,5: meta-data requested, variant list.
*/
- if (find_triple(vreq, defsetval, var1, 6, 5))
+ if (find_triple(vreq, e->defaultVariantSetId,
+ var_oid, 6, 5))
show_variantlist = 1;
/*
* 9,1: Miscellaneous, no data requested.
*/
- if (find_triple(vreq, defsetval, var1, 9, 1))
+ if (find_triple(vreq, e->defaultVariantSetId,
+ var_oid, 9, 1))
no_data = 1;
/* howmuch */
- if ((r = find_triple(vreq, defsetval, var1, 5, 5)))
+ if ((r = find_triple(vreq, e->defaultVariantSetId,
+ var_oid, 5, 5)))
if (r->which == Z_Triple_integer)
get_bytes = *r->value.integer;
if (!show_variantlist)
- match_triple (dh, vreq, defsetval, var1, c);
+ match_triple(dh, vreq, e->defaultVariantSetId,
+ var_oid, c);
}
- mark_subtree(c, show_variantlist, no_data, get_bytes, vreq);
+ mark_subtree(c, show_variantlist, no_data, get_bytes, vreq,
+ select_flag);
}
hits++;
/*
}
static int match_children(data1_handle dh, data1_node *n, Z_Espec1 *e,
- int i, Z_ETagUnit **t, int num)
+ int i, Z_ETagUnit **t, int num, int select_flag)
{
int res;
{
case Z_ETagUnit_wildThing:
case Z_ETagUnit_specificTag:
- res = match_children_here(dh, n, e, i, t, num); break;
+ res = match_children_here(dh, n, e, i, t, num, select_flag);
+ break;
case Z_ETagUnit_wildPath:
res = match_children_wildpath(dh, n, e, i, t, num); break;
default:
return 100;
match_children(dh, n, e, i,
e->elements[i]->u.simpleElement->path->tags,
- e->elements[i]->u.simpleElement->path->num_tags);
+ e->elements[i]->u.simpleElement->path->num_tags,
+ 1 /* select (include) by default */ );
}
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff