X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_doespec.c;h=c6dc0c6f77098a9ae4dcfe6ee4de77dea82e4388;hp=30345d56355f1355c9775be65d2c77d5d92befc9;hb=6c5467571389a21c91196ce1608945633c1cf92a;hpb=1b5ef8265837240930862dddd2d7ef963a0cc211

diff --git a/data1/d1_doespec.c b/data1/d1_doespec.c
index 30345d5..c6dc0c6 100644
--- a/data1/d1_doespec.c
+++ b/data1/d1_doespec.c
@@ -1,8 +1,5 @@
-/* $Id: d1_doespec.c,v 1.14 2007-04-16 21:54:37 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
@@ -25,6 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *   
  *  See http://www.loc.gov/z3950/agency/defns/variant1.html
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <stdlib.h>
 
@@ -50,14 +50,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 +107,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 +283,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_varset_variant_1;
+                    const Odr_oid *var_oid = yaz_oid_varset_variant_1;
 		    if (!vreq)
 			vreq = e->defaultVariantRequest;
 
@@ -375,6 +375,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