IDMETA and mk_version.tcl part of Windows package

[idzebra-moved-to-github.git] / data1 / d1_absyn.c

diff --git a/data1/d1_absyn.c b/data1/d1_absyn.c
index 2f03b0c..d737d35 100644 (file)
--- a/data1/d1_absyn.c
+++ b/data1/d1_absyn.c
@@ -1,8 +1,5 @@
-/* $Id: d1_absyn.c,v 1.35 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
@@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
@@ -250,7 +250,7 @@ data1_attset *data1_attset_search_name (data1_handle dh, const char *name)
     return 0;
 }
 
-data1_attset *data1_attset_search_id(data1_handle dh, const int *oid)
+data1_attset *data1_attset_search_id(data1_handle dh, const Odr_oid *oid)
 {
     data1_attset_cache p = *data1_attset_cache_get (dh);
 
@@ -864,9 +864,10 @@ static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
             data1_xpelement *xp_ele = 0;
             data1_xpelement *last_match = 0;
             
-           if (argc < 3)
+           if (argc != 3)
            {
-               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to xelm", file, lineno);
+               yaz_log(YLOG_WARN, "%s:%d: Bad # of args to %s",
+                        file, lineno, cmd);
                continue;
            }
 
@@ -1209,6 +1210,7 @@ static data1_absyn *data1_read_absyn(data1_handle dh, const char *file,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab