X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_util.c;h=26a672c1fdb5e393d4e5161056f355b7e7177da6;hp=427c16aeec36ee811c1a1e917f09c7043e9b36c3;hb=ec1f815d5348cd21e393f76bc212c910c34bbc45;hpb=c126b2a625462f95475f00efdfdf9ce41a0e9c79

diff --git a/odr/odr_util.c b/odr/odr_util.c
index 427c16a..26a672c 100644
--- a/odr/odr_util.c
+++ b/odr/odr_util.c
@@ -1,40 +1,17 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Log: odr_util.c,v $
- * Revision 1.18  2000-01-31 13:15:21  adam
- * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
- * that some characters are not surrounded by spaces in resulting term.
- * ILL-code updates.
- *
- * Revision 1.17  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.16  1999/04/20 09:56:48  adam
- * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
- * Modified all encoders/decoders to reflect this change.
- *
- * Revision 1.15  1999/01/08 11:23:29  adam
- * Added const modifier to some of the BER/ODR encoding routines.
- *
- * Revision 1.14  1998/10/13 15:58:36  adam
- * Minor fix in odr_getoidbystr_nmem.
- *
- * Revision 1.13  1998/02/11 11:53:34  adam
- * Changed code so that it compiles as C++.
- *
- * Revision 1.12  1997/10/31 12:20:08  adam
- * Improved memory debugging for xmalloc/nmem.c. References to NMEM
- * instead of ODR in n ESPEC-1 handling in source d1_espec.c.
- * Bug fix: missing fclose in data1_read_espec1.
- *
+ * $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 <string.h>
 #include <ctype.h>
-#include <yaz/odr.h>
+#include "odr-priv.h"
 #include <yaz/oid.h>
 
 void odr_prname(ODR o, const char *name)
@@ -80,10 +57,10 @@ Odr_oid *odr_oiddup(ODR odr, Odr_oid *o)
     return odr_oiddup_nmem (odr->mem, o);
 }
 
-Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
+Odr_oid *odr_getoidbystr_nmem(NMEM nmem, const char *str)
 {
     int num = 1, i = 0;
-    char *p = str;
+    const char *p = str;
     Odr_oid *ret;
 
     if (!isdigit(*str))
@@ -99,8 +76,20 @@ Odr_oid *odr_getoidbystr_nmem(NMEM nmem, char *str)
     return ret;
 }
 
-Odr_oid *odr_getoidbystr(ODR o, char *str)
+Odr_oid *odr_getoidbystr(ODR o, const char *str)
 {
     return odr_getoidbystr_nmem (o->mem, str);
 }
 
+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;
+}