X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_doespec.c;h=ce95f70a6675006cff4a074f28b2ed0f730f2303;hp=c00cc90e114d3a632bd68a23f46b1c5b279e477f;hb=a66b7d79383ae700f3358731eecfe2aafed0e90d;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index c00cc90..ce95f70 100644
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,8 +1,5 @@
-/* $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-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
@@ -50,14 +47,14 @@ static int match_children_wildpath(data1_handle dh, data1_node *n,
  * 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 
@@ -107,8 +104,8 @@ static void mark_subtree(data1_node *n, int make_variantlist, int no_data,
 
 
 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;
 
@@ -283,7 +280,7 @@ static int match_children_here (data1_handle dh, data1_node *n,
 		    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;
 
@@ -375,6 +372,7 @@ int data1_doespec1 (data1_handle dh, data1_node *n, Z_Espec1 *e)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab