Better ODR diagnostics for missing elements which includes additional

[yaz-moved-to-github.git] / odr / odr_util.c

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 0ea1c08..26a672c 100644 (file)
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,16 +1,28 @@
+/*
+ * Copyright (c) 1995-2003, Index Data
+ * See the file LICENSE for details.
+ *
+ * $Id: odr_util.c,v 1.23 2003-05-20 19:55:30 adam Exp $
+ */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
-#include <odr.h>
+#include <string.h>
+#include <ctype.h>
+#include "odr-priv.h"
+#include <yaz/oid.h>
 
-char *odr_indent(ODR o)
+void odr_prname(ODR o, const char *name)
 {
-    static char buf[512];
-
-    memset(buf, ' ', 512);
-    buf[o->indent * 4] = 0;
-    return buf;
+    if (name)
+       fprintf (o->print, "%*s%s ", o->indent*4, "", name);
+    else
+       fprintf (o->print, "%*s", o->indent*4, "");
 }
 
-int odp_more_chunks(ODR o, unsigned char *base, int len)
+int odp_more_chunks(ODR o, const unsigned char *base, int len)
 {
     if (!len)
        return 0;
@@ -19,7 +31,6 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
        if (*o->bp == 0 && *(o->bp + 1) == 0)
        {
            o->bp += 2;
-           o->left -= 2;
            return 0;
        }
        else
@@ -29,52 +40,56 @@ int odp_more_chunks(ODR o, unsigned char *base, int len)
         return o->bp - base < len;
 }
 
-/* OID utilities */
-
-void odr_oidcpy(Odr_oid *t, Odr_oid *s)
+Odr_oid *odr_oiddup_nmem(NMEM nmem, Odr_oid *o)
 {
-    while ((*(t++) = *(s++)) > -1);
-}
+    Odr_oid *r;
 
-void odr_oidcat(Odr_oid *t, Odr_oid *s)
-{
-    while (*t > -1)
-       t++;
-    while ((*(t++) = *(s++)) > -1);
+    if (!o)
+       return 0;
+    if (!(r = (int *)nmem_malloc(nmem, (oid_oidlen(o) + 1) * sizeof(int))))
+       return 0;
+    oid_oidcpy(r, o);
+    return r;
 }
 
-int odr_oidcmp(Odr_oid *o1, Odr_oid *o2)
+Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
 {
-    while (*o1 == *o2 && *o1 > -1)
-    {
-       o1++;
-       o2++;
-    }
-    if (*o1 == *o2)
-       return 0;
-    else if (*o1 > *o2)
-       return 1;
-    else
-       return -1;
+    return odr_oiddup_nmem (odr->mem, o);
 }
 
-int odr_oidlen(Odr_oid *o)
+Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
 {
-    int len = 0;
+    int num = 1, i = 0;
+    const char *p = str;
+    Odr_oid *ret;
 
-    while (*(o++) >= 0)
-       len++;
-    return len;
+    if (!isdigit(*str))
+       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;
+    return ret;
 }
 
-Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
+Odr_oid *odr_getoidbystr(ODR o, const char *str)
 {
-    Odr_oid *r;
+    return odr_getoidbystr_nmem (o->mem, str);
+}
 
-    if (!o)
-       return 0;
-    if (!(r = odr_malloc(odr, (odr_oidlen(o) + 1) * sizeof(Odr_oid))))
-       return 0;
-    odr_oidcpy(r, o);
-    return r;
+int odr_missing(ODR o, int opt, const char *name)
+{
+    if (o->error)
+        return 0;
+    if (!opt)
+    {
+        printf ("odr_missing set error : %s\n", name);
+        odr_seterror(o, OREQUIRED, 55);
+        odr_setaddinfo(o, name);
+    }
+    return opt;
 }