X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Foid_db.c;h=7815431456a2d0290a06311ffde452023678992f;hp=5d9297e98961e7d1bf268975175e9a0dd8db094f;hb=e4e5f0bfaa1fcb5eb12cc37df216352df226b01e;hpb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35 diff --git a/src/oid_db.c b/src/oid_db.c index 5d9297e..7815431 100644 --- a/src/oid_db.c +++ b/src/oid_db.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2011 Index Data + * Copyright (C) 1995-2013 Index Data * See the file LICENSE for details. */ @@ -13,7 +13,6 @@ #include #include -#include #include #include @@ -120,7 +119,7 @@ char *oid_name_to_dotstring(oid_class oclass, const char *name, char *oid_buf) 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 + && oid[2] == 840 && oid[3] == 10003 && oid[4] == 5 && oid[5] <= 29 && oid[5] != 16) return 1; return 0; @@ -195,7 +194,7 @@ void yaz_oid_trav(yaz_oid_db_t oid_db, for (; oid_db; oid_db = oid_db->next) { struct yaz_oid_entry *e = get_entries(oid_db); - + for (; e->name; e++) func(e->oid, e->oclass, e->name, client_data); }