X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fodr_util.c;h=c28c586c96b62c01a7cd156b78a4a38e63408b40;hb=be821514c869d68186361b5aab6bbfd1aa60e087;hp=370132f907b0c0734010964942bdbecc4c22c209;hpb=8d691989077a0addcbd840d769dce6700f3d9622;p=yaz-moved-to-github.git

diff --git a/src/odr_util.c b/src/odr_util.c
index 370132f..c28c586 100644
--- a/src/odr_util.c
+++ b/src/odr_util.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_util.c,v 1.9 2007-01-03 08:42:15 adam Exp $
+ * $Id: odr_util.c,v 1.12 2007-04-12 20:47:28 adam Exp $
  */
 /**
  * \file odr_util.c
@@ -16,14 +16,14 @@
 #include <string.h>
 #include <ctype.h>
 #include "odr-priv.h"
-#include <yaz/oid.h>
+#include <yaz/oid_util.h>
 
 void odr_prname(ODR o, const char *name)
 {
     if (name)
-        odr_printf(o, "%*s%s ", o->indent*4, "", name);
+        odr_printf(o, "%*s%s ", o->op->indent*4, "", name);
     else
-        odr_printf(o, "%*s", o->indent*4, "");
+        odr_printf(o, "%*s", o->op->indent*4, "");
 }
 
 int odp_more_chunks(ODR o, const unsigned char *base, int len)
@@ -44,7 +44,7 @@ int odp_more_chunks(ODR o, const unsigned char *base, int len)
         return o->bp - base < len;
 }
 
-Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
+Odr_oid *odr_oiddup_nmem(NMEM nmem, const Odr_oid *o)
 {
     Odr_oid *r;
 
@@ -56,37 +56,26 @@ Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
     return r;
 }
 
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+Odr_oid *odr_oiddup(ODR odr, const Odr_oid *o)
 {
-    if (!odr->mem)
-        odr->mem = nmem_create();
-    return odr_oiddup_nmem (odr->mem, o);
+    return odr_oiddup_nmem(odr_getmem(odr), o);
 }
 
 Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
 {
-    int num = 1, i = 0;
-    const char *p = str;
-    Odr_oid *ret;
+    int oid[OID_SIZE];
+    int *ret;
 
-    if (!isdigit(*(const unsigned char *) str))
+    if (oid_dotstring_to_oid(str, oid))
         return 0;
-    while ((p = strchr(p, '.')))
-        num++, p++;
-    ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(num + 1));
-    p = str;
-    do
-        ret[i++] = atoi(p);
-    while ((p = strchr(p, '.')) && *++p);
-    ret[i] = -1;
+    ret = (int *)nmem_malloc(nmem, sizeof(*ret)*(oid_oidlen(oid) + 1));
+    oid_oidcpy(ret, oid);
     return ret;
 }
 
 Odr_oid *odr_getoidbystr(ODR o, const char *str)
 {
-    if (!o->mem)
-        o->mem = nmem_create();
-    return odr_getoidbystr_nmem (o->mem, str);
+    return odr_getoidbystr_nmem(odr_getmem(o), str);
 }
 
 int odr_missing(ODR o, int opt, const char *name)