-/* $Id: d1_doespec.c,v 1.13 2007-04-16 08:44:31 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2011 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
* 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, const int *universal_oid,
- const int *var_oid, 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;
for (i = 0; i < var->num_triples; i++)
{
- const int *cur_oid = var->triples[i]->variantSetId;
+ const Odr_oid *cur_oid = var->triples[i]->variantSetId;
if (!cur_oid)
cur_oid = var->globalVariantSetId;
if (cur_oid && var_oid
static void match_triple(data1_handle dh, Z_Variant *vreq,
- const int *def_oid,
- const int *var_oid, data1_node *n)
+ const Odr_oid *def_oid,
+ const Odr_oid *var_oid, data1_node *n)
{
data1_node **c;
Z_Variant *vreq =
e->elements[i]->u.simpleElement->variantRequest;
- const int *var_oid = yaz_oid_variant1();
+ const Odr_oid *var_oid = yaz_oid_varset_variant_1;
if (!vreq)
vreq = e->defaultVariantRequest;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab