New OID database - with public definitions in oid_db.h. Removed old OID

[yaz-moved-to-github.git] / src / odr_oid.c

diff --git a/src/odr_oid.c b/src/odr_oid.c
index 8530f7b..361fa2b 100644 (file)
--- a/src/odr_oid.c
+++ b/src/odr_oid.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_oid.c,v 1.7 2005-06-25 15:46:04 adam Exp $
+ * $Id: odr_oid.c,v 1.10 2007-04-12 13:52:57 adam Exp $
  */
 /**
  * \file odr_oid.c
@@ -12,8 +12,8 @@
 #include <config.h>
 #endif
 
+#include <yaz/oid_util.h>
 #include "odr-priv.h"
-#include <yaz/oid.h>
 
 /*
  * Top level oid en/decoder.
@@ -25,12 +25,13 @@ int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
 
     if (o->error)
         return 0;
-    if (o->t_class < 0)
+    if (o->op->t_class < 0)
     {
-        o->t_class = ODR_UNIVERSAL;
-        o->t_tag = ODR_OID;
+        o->op->t_class = ODR_UNIVERSAL;
+        o->op->t_tag = ODR_OID;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+    res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+    if (res < 0)
         return 0;
     if (!res)
         return odr_missing(o, opt, name);