X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Foid_db.c;h=104ff930881abaacc778642ea21d6418fe06d992;hb=50606c10e645308dddb9c8d0e676b33ce38f1df8;hp=850b2a79edb5c739b54fc7e425c041e9d661152d;hpb=c618d4743a6dff2764d4a95d8bcf4fc441fcd8db;p=yaz-moved-to-github.git

diff --git a/src/oid_db.c b/src/oid_db.c
index 850b2a7..104ff93 100644
--- a/src/oid_db.c
+++ b/src/oid_db.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
  * See the file LICENSE for details.
- *
- * $Id: oid_db.c,v 1.6 2007-04-18 08:08:02 adam Exp $
  */
 
 /**
@@ -38,8 +36,8 @@ yaz_oid_db_t yaz_oid_std(void)
     return standard_db;
 }
 
-const int *yaz_string_to_oid(yaz_oid_db_t oid_db,
-			     int oclass, const char *name)
+const Odr_oid *yaz_string_to_oid(yaz_oid_db_t oid_db,
+                                 oid_class oclass, const char *name)
 {
     for (; oid_db; oid_db = oid_db->next)
     {
@@ -61,23 +59,23 @@ const int *yaz_string_to_oid(yaz_oid_db_t oid_db,
     return 0;
 }
 
-int *yaz_string_to_oid_nmem(yaz_oid_db_t oid_list,
-			    int oclass, const char *name, NMEM nmem)
+Odr_oid *yaz_string_to_oid_nmem(yaz_oid_db_t oid_list,
+                                oid_class oclass, const char *name, NMEM nmem)
 {
-    const int *oid = yaz_string_to_oid(oid_list, oclass, name);
+    const Odr_oid *oid = yaz_string_to_oid(oid_list, oclass, name);
     if (oid)
 	return odr_oiddup_nmem(nmem, oid);
     return odr_getoidbystr_nmem(nmem, name);
 }
 
-int *yaz_string_to_oid_odr(yaz_oid_db_t oid_list,
-			   int oclass, const char *name, ODR o)
+Odr_oid *yaz_string_to_oid_odr(yaz_oid_db_t oid_list,
+                               oid_class oclass, const char *name, ODR o)
 {
     return yaz_string_to_oid_nmem(oid_list, oclass, name, odr_getmem(o));
 }
 
 const char *yaz_oid_to_string(yaz_oid_db_t oid_db,
-			      const int *oid, int *oclass)
+			      const Odr_oid *oid, oid_class *oclass)
 {
     if (!oid)
 	return 0;
@@ -97,7 +95,7 @@ const char *yaz_oid_to_string(yaz_oid_db_t oid_db,
     return 0;
 }
 
-const char *yaz_oid_to_string_buf(const int *oid, int *oclass, char *buf)
+const char *yaz_oid_to_string_buf(const Odr_oid *oid, oid_class *oclass, char *buf)
 {
     const char *p = yaz_oid_to_string(standard_db, oid, oclass);
     if (p)
@@ -107,7 +105,17 @@ const char *yaz_oid_to_string_buf(const int *oid, int *oclass, char *buf)
     return oid_oid_to_dotstring(oid, buf);
 }
 
-int yaz_oid_is_iso2709(const int *oid)
+
+char *oid_name_to_dotstring(oid_class oclass, const char *name, char *oid_buf)
+{
+    const Odr_oid *oid = yaz_string_to_oid(yaz_oid_std(), oclass, name);
+    if (oid)
+        return oid_oid_to_dotstring(oid, oid_buf);
+    return 0;
+}
+
+
+int yaz_oid_is_iso2709(const Odr_oid *oid)
 {
     if (oid_oidlen(oid) == 6 && oid[0] == 1 && oid[1] == 2
 	&& oid[2] == 840 && oid[3] == 10003 && oid[4] == 5 
@@ -116,25 +124,26 @@ int yaz_oid_is_iso2709(const int *oid)
     return 0;
 }
 
-int yaz_oid_add(yaz_oid_db_t oid_db, int oclass, const char *name,
-		const int *new_oid)
+int yaz_oid_add(yaz_oid_db_t oid_db, oid_class oclass, const char *name,
+		const Odr_oid *new_oid)
 {
-    const int *oid = yaz_string_to_oid(oid_db, oclass, name);
+    const Odr_oid *oid = yaz_string_to_oid(oid_db, oclass, name);
     if (!oid)
     {
 	struct yaz_oid_entry *ent;
-        int *alloc_oid;
+        Odr_oid *alloc_oid;
 
 	while (oid_db->next)
 	    oid_db = oid_db->next;
-	oid_db->next = xmalloc(sizeof(*oid_db->next));
+	oid_db->next = (struct yaz_oid_db *) xmalloc(sizeof(*oid_db->next));
 	oid_db = oid_db->next;
 
 	oid_db->next = 0;
 	oid_db->xmalloced = 1;
-	oid_db->entries = ent = xmalloc(2 * sizeof(*ent));
+	oid_db->entries = ent = (struct yaz_oid_entry *) xmalloc(2 * sizeof(*ent));
 
-        alloc_oid = xmalloc(sizeof(*alloc_oid) * (oid_oidlen(new_oid)+1));
+        alloc_oid = (Odr_oid *)
+            xmalloc(sizeof(*alloc_oid) * (oid_oidlen(new_oid)+1));
 	oid_oidcpy(alloc_oid, new_oid);
         ent[0].oid = alloc_oid;
 	ent[0].name = xstrdup(name);
@@ -150,7 +159,7 @@ int yaz_oid_add(yaz_oid_db_t oid_db, int oclass, const char *name,
 
 yaz_oid_db_t yaz_oid_db_new(void)
 {
-    yaz_oid_db_t p = xmalloc(sizeof(*p));
+    yaz_oid_db_t p = (yaz_oid_db_t) xmalloc(sizeof(*p));
     p->entries = 0;
     p->next = 0;
     p->xmalloced = 1;
@@ -176,8 +185,8 @@ void yaz_oid_db_destroy(yaz_oid_db_t oid_db)
 }
 
 void yaz_oid_trav(yaz_oid_db_t oid_db,
-		  void (*func)(const int *oid,
-			       int oclass, const char *name,
+		  void (*func)(const Odr_oid *oid,
+			       oid_class oclass, const char *name,
 			       void *client_data),
 		  void *client_data)
 {